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

Unified Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.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/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index eda42a7a75390ddd91ce247890e1029fd99ffebb..0b36cd97460192005414e678fc04abf01408061b 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -35,6 +35,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "grit/browser_resources.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
using content::WebContents;
@@ -107,7 +108,8 @@ void OobeUIHTMLSource::StartDataRequest(const std::string& path,
std::string OobeUIHTMLSource::GetDataResource(int resource_id) const {
const base::StringPiece html(
- ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
+ ResourceBundle::GetSharedInstance().GetRawDataResource(
+ resource_id, ui::SCALE_FACTOR_NONE));
return jstemplate_builder::GetI18nTemplateHtml(html,
localized_strings_.get());
}

Powered by Google App Engine
This is Rietveld 408576698