diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 21:28:20 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 21:28:20 +0000 |
| commit | 61a796c49a99e1e43e462ffd20a489f2142efcc8 (patch) | |
| tree | 255809046b1d17f645b2fad9d3ecebf06c628915 /chrome/browser/first_run | |
| parent | 3a62d03239d6e7aacdb94650aae6d962badc0c24 (diff) | |
| download | chromium_src-61a796c49a99e1e43e462ffd20a489f2142efcc8.zip chromium_src-61a796c49a99e1e43e462ffd20a489f2142efcc8.tar.gz chromium_src-61a796c49a99e1e43e462ffd20a489f2142efcc8.tar.bz2 | |
Revert 137734 - Select theme resources from ResourceBundle at requested scale factor.
Return the best match for a requested scale factor when fetching raw image data from ResourceBundle.
TBR=aa,abodenha
BUG=123611
TEST=ResourceBundle.LoadImageResourceBytes
Review URL: https://chromiumcodereview.appspot.com/10387010
TBR=flackr@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/first_run_win.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index a66fd8c..bd3aafe 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -48,7 +48,6 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_switches.h" @@ -175,8 +174,7 @@ bool LaunchSetupWithParam(const std::string& param, // true if successful. bool WriteEULAtoTempFile(FilePath* eula_path) { base::StringPiece terms = - ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_TERMS_HTML, ui::SCALE_FACTOR_NONE); + ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_TERMS_HTML); if (terms.empty()) return false; FILE *file = file_util::CreateAndOpenTemporaryFile(eula_path); |