diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 17:03:42 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 17:03:42 +0000 |
| commit | eb2e2f4495e44ed811633b436918cca114d2d073 (patch) | |
| tree | 495ceeddea60c57e64efce4da363572954c238be /ui/test/test_suite.cc | |
| parent | 7610eabddaacd72ea8045c777df1755eca4ef79e (diff) | |
| download | chromium_src-eb2e2f4495e44ed811633b436918cca114d2d073.zip chromium_src-eb2e2f4495e44ed811633b436918cca114d2d073.tar.gz chromium_src-eb2e2f4495e44ed811633b436918cca114d2d073.tar.bz2 | |
Revert 132760 - Metro/HiDPI: Move 1x icons into separate pak file
Currently all 1x art files are repacked into chrome.pak files.
This is a problem on Windows where we want to choose which pak file to load based on metro and DPI scale.
As a first step this CL does the following:
- add a new enable_hidpi build flag. This allows us to test HiDPI mode on Windows Chrome.
- stop packing theme_resources_standard.pak and ui_resources_standard.pak into chrome.pak
- update the Mac and Windows installer code to package the extra pak files.
Note, I'll be updating the Linux installer script in a separate CL. I'm still looking into the ChromeOS situation.
BUG=114311
TEST=Ran on Windows, and Mac and Linux.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=132517
Review URL: http://codereview.chromium.org/10024050
TBR=sail@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10115031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/test/test_suite.cc')
| -rw-r--r-- | ui/test/test_suite.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc index 024543e..bd4e325 100644 --- a/ui/test/test_suite.cc +++ b/ui/test/test_suite.cc @@ -46,16 +46,13 @@ void UITestSuite::Initialize() { PathService::Get(base::DIR_MODULE, &pak_dir); pak_dir = pak_dir.AppendASCII("ui_unittests_strings"); PathService::Override(ui::DIR_LOCALES, pak_dir); + PathService::Override(ui::FILE_RESOURCES_PAK, + pak_dir.AppendASCII("ui_resources.pak")); #endif // defined(OS_MACOSX) // Force unittests to run using en-US so if we test against string // output, it'll pass regardless of the system language. ui::ResourceBundle::InitSharedInstanceWithLocale("en-US"); - -#if !defined(OS_MACOSX) && defined(OS_POSIX) - ui::ResourceBundle::GetSharedInstance().AddDataPack( - pak_dir.AppendASCII("ui_resources.pak")); -#endif } void UITestSuite::Shutdown() { |