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/resource_bundle_linux.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/resource_bundle_linux.cc')
| -rw-r--r-- | app/resource_bundle_linux.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc index 9f0fd56..7ebe4e6 100644 --- a/app/resource_bundle_linux.cc +++ b/app/resource_bundle_linux.cc @@ -67,10 +67,8 @@ void ResourceBundle::FreeGdkPixBufs() { // static FilePath ResourceBundle::GetResourcesFilePath() { FilePath resources_file_path; - PathService::Get(base::DIR_EXE, &resources_file_path); - if (resources_file_path.empty()) - return resources_file_path; - return resources_file_path.Append(FILE_PATH_LITERAL("chrome.pak")); + PathService::Get(app::FILE_RESOURCES_PAK, &resources_file_path); + return resources_file_path; } // static |