Index: chrome/common/chrome_paths.cc |
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc |
index 6d4849e8e10e5c31de9dba9c3c3f59b02c520ce1..c88ce1025e0f8a68f3e586800314ee4835586647 100644 |
--- a/chrome/common/chrome_paths.cc |
+++ b/chrome/common/chrome_paths.cc |
@@ -71,6 +71,19 @@ const FilePath::CharType kGTalkPluginFileName[] = |
FILE_PATH_LITERAL("pepper/libppgoogletalk.so"); |
#endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
+ |
+#if defined(OS_LINUX) |
Finnur
2012/04/24 13:03:24
... and not OS_CHROMEOS ?
Alexandre Abreu
2012/04/24 19:30:30
Done.
|
+// The search path that contains information about per-extension |
+// definition files. |
+// /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ |
+const char kFilepathSinglePrefExtensions[] = |
+#if defined(GOOGLE_CHROME_BUILD) |
+ FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); |
+#else |
+ FILE_PATH_LITERAL("/usr/share/chromium/extensions"); |
+#endif |
Finnur
2012/04/24 13:03:24
missing: // defined(GOOGLE_CHROME_BUILD)
Alexandre Abreu
2012/04/24 19:30:30
Done.
|
+#endif // defined(OS_LINUX) |
Finnur
2012/04/24 13:03:24
... and not OS_CHROMEOS ?
Alexandre Abreu
2012/04/24 19:30:30
Done.
|
+ |
} // namespace |
namespace chrome { |
@@ -361,6 +374,12 @@ bool PathProvider(int key, FilePath* result) { |
break; |
} |
#endif |
+#if defined(OS_LINUX) |
Finnur
2012/04/24 13:03:24
Ditto.
Alexandre Abreu
2012/04/24 19:30:30
Done.
|
+ case chrome::DIR_SINGLE_EXTERNAL_EXTENSIONS: { |
+ cur = FilePath(FILE_PATH_LITERAL(kFilepathSinglePrefExtensions)); |
+ break; |
+ } |
+#endif |
case chrome::DIR_EXTERNAL_EXTENSIONS: |
#if defined(OS_MACOSX) |
if (!chrome::GetGlobalApplicationSupportDirectory(&cur)) |