extensions/renderer/dispatcher.cc - Issue 307833002: Move some extensions renderer resources to extensions_renderer_resources.grd.

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: extensions/renderer/dispatcher.cc

Issue 307833002: Move some extensions renderer resources to extensions_renderer_resources.grd. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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

« chrome/renderer/resources/renderer_resources.grd ('K') | « extensions/extensions_resources.gyp ('k') | extensions/renderer/resources/app_runtime_custom_bindings.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/dispatcher.cc

diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc

index df35567b7d9a7845cbcea06e7921b5a0613e9055..286853b1c8a0c7604567ead3c31c17b9670a69a9 100644

--- a/extensions/renderer/dispatcher.cc

+++ b/extensions/renderer/dispatcher.cc

@@ -73,7 +73,7 @@

#include "extensions/renderer/user_script_slave.h"

#include "extensions/renderer/utils_native_handler.h"

#include "extensions/renderer/v8_context_native_handler.h"

-#include "grit/renderer_resources.h"

+#include "grit/extensions_renderer_resources.h"

#include "third_party/WebKit/public/platform/WebString.h"

#include "third_party/WebKit/public/platform/WebURLRequest.h"

#include "third_party/WebKit/public/web/WebCustomElement.h"

@@ -318,6 +318,7 @@ void Dispatcher::DidCreateDocumentElement(blink::WebFrame* frame) {

// WebKit doesn't let us define an additional user agent stylesheet, so we

// insert the default platform app stylesheet into all documents that are

// loaded in each app.

std::string stylesheet = ResourceBundle::GetSharedInstance()

.GetRawDataResource(IDR_PLATFORM_APP_CSS)

.as_string();