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

Side by Side Diff: trunk/src/extensions/renderer/script_injection.cc

Issue 309413002: Revert 274558 "Move some extensions renderer resources to extens..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/renderer/script_injection.h" 5 #include "extensions/renderer/script_injection.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "content/public/common/url_constants.h" 11 #include "content/public/common/url_constants.h"
12 #include "extensions/common/extension.h" 12 #include "extensions/common/extension.h"
13 #include "extensions/common/extension_messages.h" 13 #include "extensions/common/extension_messages.h"
14 #include "extensions/common/permissions/permissions_data.h" 14 #include "extensions/common/permissions/permissions_data.h"
15 #include "extensions/renderer/dom_activity_logger.h" 15 #include "extensions/renderer/dom_activity_logger.h"
16 #include "extensions/renderer/extension_groups.h" 16 #include "extensions/renderer/extension_groups.h"
17 #include "extensions/renderer/script_context.h" 17 #include "extensions/renderer/script_context.h"
18 #include "extensions/renderer/user_script_slave.h" 18 #include "extensions/renderer/user_script_slave.h"
19 #include "grit/extensions_renderer_resources.h" 19 #include "grit/renderer_resources.h"
20 #include "third_party/WebKit/public/web/WebDocument.h" 20 #include "third_party/WebKit/public/web/WebDocument.h"
21 #include "third_party/WebKit/public/web/WebFrame.h" 21 #include "third_party/WebKit/public/web/WebFrame.h"
22 #include "third_party/WebKit/public/web/WebScriptSource.h" 22 #include "third_party/WebKit/public/web/WebScriptSource.h"
23 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
24 #include "url/gurl.h" 24 #include "url/gurl.h"
25 25
26 namespace extensions { 26 namespace extensions {
27 27
28 namespace { 28 namespace {
29 29
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 scripts_run_info->num_css += css_scripts.size(); 193 scripts_run_info->num_css += css_scripts.size();
194 for (UserScript::FileList::const_iterator iter = css_scripts.begin(); 194 for (UserScript::FileList::const_iterator iter = css_scripts.begin();
195 iter != css_scripts.end(); 195 iter != css_scripts.end();
196 ++iter) { 196 ++iter) {
197 frame->document().insertStyleSheet( 197 frame->document().insertStyleSheet(
198 blink::WebString::fromUTF8(iter->GetContent().as_string())); 198 blink::WebString::fromUTF8(iter->GetContent().as_string()));
199 } 199 }
200 } 200 }
201 201
202 } // namespace extensions 202 } // namespace extensions
OLDNEW
« no previous file with comments | « trunk/src/extensions/renderer/resources/utils.js ('k') | trunk/src/tools/gritsettings/resource_ids » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698