diff options
author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 19:37:49 +0000 |
---|---|---|
committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 19:37:49 +0000 |
commit | f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd (patch) | |
tree | d9e4007577c580fee5dc364484809ff1a682e405 /ui/test/test_suite.cc | |
parent | fcd4ccd070f7ee5c6b8d27d47a5784e752a14856 (diff) | |
download | chromium_src-f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd.zip chromium_src-f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd.tar.gz chromium_src-f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd.tar.bz2 |
Revert 147288 - Renamed resource files to be more verbose, specifically:
[ui,theme]_resources_standard.[pak,rc] changed to .._resources_100_percent..
and likewise
[ui,theme]_resources_2x.pak changed to .._resources_200_percent.pak
BUG=120185
TEST=run chome,ash_shell confirm assets loaded
Review URL: https://chromiumcodereview.appspot.com/10694170
TBR=harrym@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10806018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/test/test_suite.cc')
-rw-r--r-- | ui/test/test_suite.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc index 6f1a239..e341706 100644 --- a/ui/test/test_suite.cc +++ b/ui/test/test_suite.cc @@ -55,7 +55,7 @@ void UITestSuite::Initialize() { #if !defined(OS_MACOSX) && defined(OS_POSIX) ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( - pak_dir.AppendASCII("ui_resources_100_percent.pak"), + pak_dir.AppendASCII("ui_resources_standard.pak"), ui::SCALE_FACTOR_100P); #endif } |