diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 16:43:06 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 16:43:06 +0000 |
| commit | 708bfade92371f332193719397c26f8568363cdb (patch) | |
| tree | 55ab3c70bdb401e3268a3953c9a9946d84c7a1f3 /ui/base/resource/resource_bundle_win.cc | |
| parent | 123d80775a39200f05bd6baf5ac779bee18030e6 (diff) | |
| download | chromium_src-708bfade92371f332193719397c26f8568363cdb.zip chromium_src-708bfade92371f332193719397c26f8568363cdb.tar.gz chromium_src-708bfade92371f332193719397c26f8568363cdb.tar.bz2 | |
Reland 150411 - "Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files."
BUG=139803
TEST=Chrome runs with ui and theme resources correctly loaded.
Review URL: https://chromiumcodereview.appspot.com/10825111
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10827225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/resource/resource_bundle_win.cc')
| -rw-r--r-- | ui/base/resource/resource_bundle_win.cc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc index cb2287a..0f6092d 100644 --- a/ui/base/resource/resource_bundle_win.cc +++ b/ui/base/resource/resource_bundle_win.cc @@ -49,29 +49,20 @@ void ResourceBundle::LoadCommonResources() { switch (ui::GetDisplayLayout()) { case ui::LAYOUT_TOUCH: AddDataPackFromPath( - GetResourcesPakFilePath("theme_resources_touch_100_percent.pak"), - SCALE_FACTOR_100P); - AddDataPackFromPath( - GetResourcesPakFilePath("ui_resources_100_percent.pak"), + GetResourcesPakFilePath("chrome_touch_100_percent.pak"), SCALE_FACTOR_100P); break; default: if (use_hidpi) { AddDataPackFromPath(GetResourcesPakFilePath( - "theme_resources_200_percent.pak"), - SCALE_FACTOR_200P); - AddDataPackFromPath(GetResourcesPakFilePath( - "ui_resources_200_percent.pak"), + "chrome_200_percent.pak"), SCALE_FACTOR_200P); AddDataPackFromPath(GetResourcesPakFilePath( "webkit_resources_200_percent.pak"), SCALE_FACTOR_200P); } else { AddDataPackFromPath( - GetResourcesPakFilePath("theme_resources_100_percent.pak"), - SCALE_FACTOR_100P); - AddDataPackFromPath( - GetResourcesPakFilePath("ui_resources_100_percent.pak"), + GetResourcesPakFilePath("chrome_100_percent.pak"), SCALE_FACTOR_100P); } break; |