diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 02:12:11 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 02:12:11 +0000 |
| commit | 2e317bffec137548f6240fff37b70b5f4b372740 (patch) | |
| tree | 3db7b06819fcd1e729530a801dccaa74653a2644 /ui/test | |
| parent | 83d9dc34879eb006cb7f3ba53f0e6ec5e24772a9 (diff) | |
| download | chromium_src-2e317bffec137548f6240fff37b70b5f4b372740.zip chromium_src-2e317bffec137548f6240fff37b70b5f4b372740.tar.gz chromium_src-2e317bffec137548f6240fff37b70b5f4b372740.tar.bz2 | |
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.
Review URL: http://codereview.chromium.org/10024050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/test')
| -rw-r--r-- | ui/test/test_suite.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc index bd4e325..024543e 100644 --- a/ui/test/test_suite.cc +++ b/ui/test/test_suite.cc @@ -46,13 +46,16 @@ 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() { |