Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1238)

Unified Diff: chrome/browser/first_run/first_run_win.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/first_run/first_run_win.cc
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index bd3aafec1b9b97486defab3bffd34a327fed967b..a66fd8c9631a935484c58bd87fd0b415980f8e13 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -48,6 +48,7 @@
#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"
@@ -174,7 +175,8 @@ bool LaunchSetupWithParam(const std::string& param,
// true if successful.
bool WriteEULAtoTempFile(FilePath* eula_path) {
base::StringPiece terms =
- ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_TERMS_HTML);
+ ResourceBundle::GetSharedInstance().GetRawDataResource(
+ IDR_TERMS_HTML, ui::SCALE_FACTOR_NONE);
if (terms.empty())
return false;
FILE *file = file_util::CreateAndOpenTemporaryFile(eula_path);

Powered by Google App Engine
This is Rietveld 408576698