sync ports with The Matrix
This commit is contained in:
parent
2c0afcbbf3
commit
b72ce7a5e9
1248 changed files with 11809 additions and 12798 deletions
|
@ -28,7 +28,7 @@ Index: chrome/common/chrome_paths.cc
|
|||
if (!GetUserDownloadsDirectorySafe(&cur))
|
||||
return false;
|
||||
break;
|
||||
@@ -418,10 +418,12 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -419,10 +419,12 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
if (!base::PathExists(cur)) // We don't want to create this
|
||||
return false;
|
||||
break;
|
||||
|
@ -42,7 +42,7 @@ Index: chrome/common/chrome_paths.cc
|
|||
#else
|
||||
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
|
||||
#endif
|
||||
@@ -433,7 +435,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -434,7 +436,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH) || \
|
||||
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
|
||||
BUILDFLAG(CHROMIUM_BRANDING)) || \
|
||||
|
@ -51,7 +51,7 @@ Index: chrome/common/chrome_paths.cc
|
|||
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
|
||||
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
|
||||
return false;
|
||||
@@ -441,7 +443,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -442,7 +444,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
@ -60,7 +60,7 @@ Index: chrome/common/chrome_paths.cc
|
|||
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
|
||||
cur = base::FilePath(kFilepathSinglePrefExtensions);
|
||||
break;
|
||||
@@ -485,7 +487,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -486,7 +488,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
break;
|
||||
#endif
|
||||
|
||||
|
@ -69,7 +69,7 @@ Index: chrome/common/chrome_paths.cc
|
|||
case chrome::DIR_NATIVE_MESSAGING:
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
@@ -499,6 +501,9 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -500,6 +502,9 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
cur = base::FilePath(FILE_PATH_LITERAL(
|
||||
"/etc/opt/chrome/native-messaging-hosts"));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue