diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 05:28:06 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 05:28:06 +0000 |
| commit | 998e51f6531af4f086aaaf5a43373f06b8dbcbe5 (patch) | |
| tree | 1bda6def7e69d4adeb0d57219ab59325974389e2 /app/app_paths.cc | |
| parent | 1958e0ef0fe59e392cab9bb351401beeb64e8379 (diff) | |
| download | chromium_src-998e51f6531af4f086aaaf5a43373f06b8dbcbe5.zip chromium_src-998e51f6531af4f086aaaf5a43373f06b8dbcbe5.tar.gz chromium_src-998e51f6531af4f086aaaf5a43373f06b8dbcbe5.tar.bz2 | |
Remove app.gyp dependency on chrome.gyp.
The problem is that app_unittests tries to use pak files generated
by chrome.gyp. Instead, create new .pak files in app_unittest_strings
and have app_unittests use those pak files instead.
Review URL: http://codereview.chromium.org/1748004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/app_paths.cc')
| -rw-r--r-- | app/app_paths.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/app_paths.cc b/app/app_paths.cc index 315efec8..0007a10 100644 --- a/app/app_paths.cc +++ b/app/app_paths.cc @@ -55,6 +55,16 @@ bool PathProvider(int key, FilePath* result) { create_dir = true; #endif break; + case app::FILE_RESOURCES_PAK: +#if defined(OS_LINUX) + if (!PathService::Get(base::DIR_EXE, &cur)) + return false; + // TODO(tony): We shouldn't be referencing chrome here. + cur = cur.AppendASCII("chrome.pak"); +#else + NOTREACHED(); +#endif + break; // The following are only valid in the development environment, and // will fail if executed from an installed executable (because the // generated path won't exist). |