1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
Description: Prefer a /usr/share directory named after the package if it
exists.
Author: Chad Miller <chad.miller@canonical.com>
Index: beta.vivid/chrome/common/chrome_paths.cc
===================================================================
--- beta.vivid.orig/chrome/common/chrome_paths.cc 2015-06-24 23:38:13.549621158 -0400
+++ beta.vivid/chrome/common/chrome_paths.cc 2015-06-24 23:38:13.546621203 -0400
@@ -75,6 +75,8 @@
#else
FILE_PATH_LITERAL("/usr/share/chromium/extensions");
#endif // defined(GOOGLE_CHROME_BUILD)
+const base::FilePath::CharType kFilepathSinglePrefExtensionsNew[] =
+ FILE_PATH_LITERAL("/usr/share/chromium-browser/extensions");
#endif // defined(OS_LINUX)
static base::LazyInstance<base::FilePath>
@@ -458,6 +460,9 @@
cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
+ if (!base::PathExists(cur)) {
+ cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium-browser/policies"));
+ }
#endif
break;
}
@@ -488,6 +493,10 @@
#endif
#if defined(OS_LINUX)
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
+ if (access(kFilepathSinglePrefExtensionsNew, R_OK|X_OK) == 0) {
+ cur = base::FilePath(kFilepathSinglePrefExtensionsNew);
+ break;
+ }
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
}
@@ -538,6 +547,10 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/chromium/native-messaging-hosts"));
+ if (!base::PathExists(cur))
+ cur = base::FilePath(FILE_PATH_LITERAL(
+ "/etc/chromium-browser/native-messaging-hosts"));
+
#endif
#endif // !defined(OS_MACOSX)
break;
|