diff options
| author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 16:11:01 +0000 |
|---|---|---|
| committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 16:11:01 +0000 |
| commit | 91dbd88077b5e883b27bb26e3c9c3e2749172839 (patch) | |
| tree | 41591115202af394aa83e81d17262f5737ceb0a9 /chrome/common/chrome_paths.cc | |
| parent | 44255b16486a8e6c31a50f11eaf6ba097302d45b (diff) | |
| download | chromium_src-91dbd88077b5e883b27bb26e3c9c3e2749172839.zip chromium_src-91dbd88077b5e883b27bb26e3c9c3e2749172839.tar.gz chromium_src-91dbd88077b5e883b27bb26e3c9c3e2749172839.tar.bz2 | |
Support DIR_STANDALONE_EXTERNAL_EXTENSIONS on Chrome OS
This source of external extensions will be used on Chrome OS for installing board specific
default extensions. They need to be from CWS same as other default apps on Chrome OS.
BUG=149158
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10916312
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.cc')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index ec3d49e..62c5b37 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -75,7 +75,7 @@ const FilePath::CharType kGTalkPluginFileName[] = #endif // defined(OS_POSIX) && !defined(OS_MACOSX) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) // The path to the external extension <id>.json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ const char kFilepathSinglePrefExtensions[] = @@ -84,7 +84,7 @@ const char kFilepathSinglePrefExtensions[] = #else FILE_PATH_LITERAL("/usr/share/chromium/extensions"); #endif // defined(GOOGLE_CHROME_BUILD) -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) } // namespace @@ -416,7 +416,7 @@ bool PathProvider(int key, FilePath* result) { break; } #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = FilePath(FILE_PATH_LITERAL(kFilepathSinglePrefExtensions)); break; |