chrome/renderer/extensions/extension_dispatcher.cc - Issue 10412004: Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/renderer/extensions/extension_dispatcher.cc

Issue 10412004: Revert "Revert 137734 - 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 cc80850a6bce8a516d23d99c66e265a5df6a4ca3..2516534822f2b9a3637596b98a062e95aad4557c 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"

@@ -414,7 +415,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);

« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/renderer/extensions/json_schema_unittest.cc » ('j') | no next file with comments »