diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 22:50:28 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 22:50:28 +0000 |
| commit | 475a87a928354bd896d4149f69de2c01185f6187 (patch) | |
| tree | 6244df23cf0eb17201d2ee178017846032522edc /ui | |
| parent | 864bca830cc7889b457f3e4a77be0712b3c69e93 (diff) | |
| download | chromium_src-475a87a928354bd896d4149f69de2c01185f6187.zip chromium_src-475a87a928354bd896d4149f69de2c01185f6187.tar.gz chromium_src-475a87a928354bd896d4149f69de2c01185f6187.tar.bz2 | |
Revert 217346 "Remove chrome.pak references, build resources int..."
Compile failures on main builders, not seen on try bots.
> Remove chrome.pak references, build resources into resources.pak
>
> This puts resources that used to be in chrome.pak and/or compiled in to
> chrome.dll into resources.pak. resources.pak is already loaded at startup
> on all platforms so having some resources in a separate pak file isn't
> beneficial.
>
> TBR=tony@chromium.org
>
> BUG=52609
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216822
>
> Review URL: https://codereview.chromium.org/22339020
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/22794013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/resource/resource_bundle_android.cc | 2 | ||||
| -rw-r--r-- | ui/base/resource/resource_bundle_auralinux.cc | 3 | ||||
| -rw-r--r-- | ui/base/resource/resource_bundle_gtk.cc | 2 | ||||
| -rw-r--r-- | ui/base/resource/resource_bundle_mac.mm | 2 | ||||
| -rw-r--r-- | ui/ui_unittests.isolate | 1 |
5 files changed, 10 insertions, 0 deletions
diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc index b194269..c701a291 100644 --- a/ui/base/resource/resource_bundle_android.cc +++ b/ui/base/resource/resource_bundle_android.cc @@ -19,6 +19,8 @@ namespace ui { void ResourceBundle::LoadCommonResources() { base::FilePath path; PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &path); + AddDataPackFromPath(path.AppendASCII("chrome.pak"), + SCALE_FACTOR_NONE); AddDataPackFromPath(path.AppendASCII("chrome_100_percent.pak"), SCALE_FACTOR_100P); } diff --git a/ui/base/resource/resource_bundle_auralinux.cc b/ui/base/resource/resource_bundle_auralinux.cc index d535717..4bc7ee6 100644 --- a/ui/base/resource/resource_bundle_auralinux.cc +++ b/ui/base/resource/resource_bundle_auralinux.cc @@ -33,6 +33,9 @@ void ResourceBundle::LoadCommonResources() { // Always load the 1x data pack first as the 2x data pack contains both 1x and // 2x images. The 1x data pack only has 1x images, thus passes in an accurate // scale factor to gfx::ImageSkia::AddRepresentation. + + AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"), + SCALE_FACTOR_NONE); AddDataPackFromPath(GetResourcesPakFilePath( "chrome_100_percent.pak"), SCALE_FACTOR_100P); diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc index 679b85c..4d16b61 100644 --- a/ui/base/resource/resource_bundle_gtk.cc +++ b/ui/base/resource/resource_bundle_gtk.cc @@ -65,6 +65,8 @@ base::FilePath GetResourcesPakFilePath(const std::string& pak_name) { } // namespace void ResourceBundle::LoadCommonResources() { + AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"), + SCALE_FACTOR_NONE); AddDataPackFromPath(GetResourcesPakFilePath( "chrome_100_percent.pak"), SCALE_FACTOR_100P); diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index 56d16d5..5de8ecc 100644 --- a/ui/base/resource/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -49,6 +49,8 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) { } // namespace void ResourceBundle::LoadCommonResources() { + AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil), + SCALE_FACTOR_NONE); AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent", nil), SCALE_FACTOR_100P); AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent", diff --git a/ui/ui_unittests.isolate b/ui/ui_unittests.isolate index 55ce04a..35f732b 100644 --- a/ui/ui_unittests.isolate +++ b/ui/ui_unittests.isolate @@ -7,6 +7,7 @@ 'variables': { 'isolate_dependency_tracked': [ 'base/test/data/data_pack_unittest/truncated-header.pak', + '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/locales/en-US.pak', ], }, |