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

Side by Side Diff: trunk/src/extensions/renderer/dispatcher.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/dispatcher.h" 5 #include "extensions/renderer/dispatcher.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/alias.h" 9 #include "base/debug/alias.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "extensions/renderer/safe_builtins.h" 66 #include "extensions/renderer/safe_builtins.h"
67 #include "extensions/renderer/script_context.h" 67 #include "extensions/renderer/script_context.h"
68 #include "extensions/renderer/script_context_set.h" 68 #include "extensions/renderer/script_context_set.h"
69 #include "extensions/renderer/send_request_natives.h" 69 #include "extensions/renderer/send_request_natives.h"
70 #include "extensions/renderer/set_icon_natives.h" 70 #include "extensions/renderer/set_icon_natives.h"
71 #include "extensions/renderer/test_features_native_handler.h" 71 #include "extensions/renderer/test_features_native_handler.h"
72 #include "extensions/renderer/user_gestures_native_handler.h" 72 #include "extensions/renderer/user_gestures_native_handler.h"
73 #include "extensions/renderer/user_script_slave.h" 73 #include "extensions/renderer/user_script_slave.h"
74 #include "extensions/renderer/utils_native_handler.h" 74 #include "extensions/renderer/utils_native_handler.h"
75 #include "extensions/renderer/v8_context_native_handler.h" 75 #include "extensions/renderer/v8_context_native_handler.h"
76 #include "grit/extensions_renderer_resources.h" 76 #include "grit/renderer_resources.h"
77 #include "third_party/WebKit/public/platform/WebString.h" 77 #include "third_party/WebKit/public/platform/WebString.h"
78 #include "third_party/WebKit/public/platform/WebURLRequest.h" 78 #include "third_party/WebKit/public/platform/WebURLRequest.h"
79 #include "third_party/WebKit/public/web/WebCustomElement.h" 79 #include "third_party/WebKit/public/web/WebCustomElement.h"
80 #include "third_party/WebKit/public/web/WebDataSource.h" 80 #include "third_party/WebKit/public/web/WebDataSource.h"
81 #include "third_party/WebKit/public/web/WebDocument.h" 81 #include "third_party/WebKit/public/web/WebDocument.h"
82 #include "third_party/WebKit/public/web/WebFrame.h" 82 #include "third_party/WebKit/public/web/WebFrame.h"
83 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 83 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
84 #include "third_party/WebKit/public/web/WebScopedUserGesture.h" 84 #include "third_party/WebKit/public/web/WebScopedUserGesture.h"
85 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" 85 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
86 #include "third_party/WebKit/public/web/WebView.h" 86 #include "third_party/WebKit/public/web/WebView.h"
(...skipping 1131 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 return v8::Handle<v8::Object>(); 1218 return v8::Handle<v8::Object>();
1219 1219
1220 if (bind_name) 1220 if (bind_name)
1221 *bind_name = split.back(); 1221 *bind_name = split.back();
1222 1222
1223 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context)) 1223 return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context))
1224 : bind_object; 1224 : bind_object;
1225 } 1225 }
1226 1226
1227 } // namespace extensions 1227 } // namespace extensions
OLDNEW
« no previous file with comments | « trunk/src/extensions/extensions_resources.gyp ('k') | trunk/src/extensions/renderer/resources/app_runtime_custom_bindings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698