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

Unified Diff: chrome/renderer/extensions/extension_dispatcher.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/renderer/extensions/extension_dispatcher.cc
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index 9706f67b91a70a177997fc637ad46c993f578126..30876ca28ee3f0098188cb308dba2c894c0a9c8e 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -57,6 +57,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#include "v8/include/v8.h"
@@ -412,7 +413,8 @@ void ExtensionDispatcher::OnLoaded(
patterns.assign(platform_app_patterns);
WebView::addUserStyleSheet(
WebString::fromUTF8(ResourceBundle::GetSharedInstance().
- GetRawDataResource(IDR_PLATFORM_APP_CSS)),
+ GetRawDataResource(IDR_PLATFORM_APP_CSS,
+ ui::SCALE_FACTOR_NONE)),
patterns,
WebView::UserContentInjectInAllFrames,
WebView::UserStyleInjectInExistingDocuments);

Powered by Google App Engine
This is Rietveld 408576698