diff options
| author | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 19:09:16 +0000 |
|---|---|---|
| committer | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 19:09:16 +0000 |
| commit | b23b1b484ab4f78d5c3107126489328fc8352164 (patch) | |
| tree | 49d656da83e43cc3f5c585e7a899a0c53a992e56 /chrome/common/chrome_paths.cc | |
| parent | d88a7a0805c7cfcbcd05f4876e4314cdb8f9ef97 (diff) | |
| download | chromium_src-b23b1b484ab4f78d5c3107126489328fc8352164.zip chromium_src-b23b1b484ab4f78d5c3107126489328fc8352164.tar.gz chromium_src-b23b1b484ab4f78d5c3107126489328fc8352164.tar.bz2 | |
Add schema chrome-extension-resource:// for extension resources. It may be used for bundle JS libraries in future
like Google Analytics JS library.
Mark a test case flaky for OSX, and reland it.
BUG=122987
TEST=unit_tests --gtest_filter=ExtensionFileUtil.*
TEST=browser_tests --gtest_filter=ExtensionResourceRequestPolicyTest*
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=137794
Review URL: https://chromiumcodereview.appspot.com/9909019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137918 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, 6 insertions, 0 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 4bd6bf0..edeb082 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -307,6 +307,12 @@ bool PathProvider(int key, FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("resources.pak")); break; + case chrome::DIR_RESOURCES_EXTENSION: + if (!PathService::Get(base::DIR_MODULE, &cur)) + return false; + cur = cur.Append(FILE_PATH_LITERAL("resources")) + .Append(FILE_PATH_LITERAL("extension")); + break; #if defined(OS_CHROMEOS) case chrome::FILE_CHROMEOS_API: if (!PathService::Get(base::DIR_MODULE, &cur)) |