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

Side by Side Diff: chrome/renderer/extensions/extension_process_bindings.cc

Issue 6765011: Move the dispatching of extension messages out of RenderThread. This also moves a bunch of exten... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/renderer/extensions/extension_process_bindings.h" 5 #include "chrome/renderer/extensions/extension_process_bindings.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/json/json_reader.h" 13 #include "base/json/json_reader.h"
14 #include "base/lazy_instance.h" 14 #include "base/lazy_instance.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/string_number_conversions.h" 16 #include "base/string_number_conversions.h"
17 #include "base/string_util.h" 17 #include "base/string_util.h"
18 #include "chrome/common/extensions/extension.h" 18 #include "chrome/common/extensions/extension.h"
19 #include "chrome/common/extensions/extension_constants.h" 19 #include "chrome/common/extensions/extension_constants.h"
20 #include "chrome/common/extensions/extension_messages.h" 20 #include "chrome/common/extensions/extension_messages.h"
21 #include "chrome/common/extensions/extension_set.h" 21 #include "chrome/common/extensions/extension_set.h"
22 #include "chrome/common/extensions/url_pattern.h" 22 #include "chrome/common/extensions/url_pattern.h"
23 #include "chrome/common/render_messages.h" 23 #include "chrome/common/render_messages.h"
24 #include "chrome/common/render_messages_params.h" 24 #include "chrome/common/render_messages_params.h"
25 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
26 #include "chrome/renderer/extensions/bindings_utils.h" 26 #include "chrome/renderer/extensions/bindings_utils.h"
27 #include "chrome/renderer/extensions/event_bindings.h" 27 #include "chrome/renderer/extensions/event_bindings.h"
28 #include "chrome/renderer/extensions/extension_dispatcher.h"
28 #include "chrome/renderer/extensions/js_only_v8_extensions.h" 29 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
29 #include "chrome/renderer/extensions/renderer_extension_bindings.h" 30 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
30 #include "chrome/renderer/user_script_slave.h" 31 #include "chrome/renderer/user_script_slave.h"
31 #include "chrome/renderer/render_thread.h" 32 #include "chrome/renderer/render_thread.h"
32 #include "content/renderer/render_view.h" 33 #include "content/renderer/render_view.h"
33 #include "content/renderer/render_view_visitor.h" 34 #include "content/renderer/render_view_visitor.h"
34 #include "grit/common_resources.h" 35 #include "grit/common_resources.h"
35 #include "grit/renderer_resources.h" 36 #include "grit/renderer_resources.h"
36 #include "third_party/skia/include/core/SkBitmap.h" 37 #include "third_party/skia/include/core/SkBitmap.h"
37 #include "third_party/skia/include/core/SkColor.h" 38 #include "third_party/skia/include/core/SkColor.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 197
197 // Note: do not call this function before or during the chromeHidden.onLoad 198 // Note: do not call this function before or during the chromeHidden.onLoad
198 // event dispatch. The URL might not have been committed yet and might not 199 // event dispatch. The URL might not have been committed yet and might not
199 // be an extension URL. 200 // be an extension URL.
200 static std::string ExtensionIdForCurrentContext() { 201 static std::string ExtensionIdForCurrentContext() {
201 RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext(); 202 RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
202 if (!renderview) 203 if (!renderview)
203 return std::string(); // this can happen as a tab is closing. 204 return std::string(); // this can happen as a tab is closing.
204 205
205 GURL url = renderview->webview()->mainFrame()->url(); 206 GURL url = renderview->webview()->mainFrame()->url();
206 const ExtensionSet* extensions = 207 const ExtensionSet* extensions = ExtensionDispatcher::Get()->extensions();
207 EventBindings::GetRenderThread()->GetExtensions();
208 if (!extensions->ExtensionBindingsAllowed(url)) 208 if (!extensions->ExtensionBindingsAllowed(url))
209 return std::string(); 209 return std::string();
210 210
211 return extensions->GetIdByURL(url); 211 return extensions->GetIdByURL(url);
212 } 212 }
213 213
214 virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction( 214 virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
215 v8::Handle<v8::String> name) { 215 v8::Handle<v8::String> name) {
216 if (name->Equals(v8::String::New("GetExtensionAPIDefinition"))) { 216 if (name->Equals(v8::String::New("GetExtensionAPIDefinition"))) {
217 return v8::FunctionTemplate::New(GetExtensionAPIDefinition); 217 return v8::FunctionTemplate::New(GetExtensionAPIDefinition);
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 static v8::Handle<v8::Value> GetRenderViewId(const v8::Arguments& args) { 502 static v8::Handle<v8::Value> GetRenderViewId(const v8::Arguments& args) {
503 RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext(); 503 RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
504 if (!renderview) 504 if (!renderview)
505 return v8::Undefined(); 505 return v8::Undefined();
506 return v8::Integer::New(renderview->routing_id()); 506 return v8::Integer::New(renderview->routing_id());
507 } 507 }
508 508
509 static v8::Handle<v8::Value> IsExtensionProcess(const v8::Arguments& args) { 509 static v8::Handle<v8::Value> IsExtensionProcess(const v8::Arguments& args) {
510 bool retval = false; 510 bool retval = false;
511 if (EventBindings::GetRenderThread()) 511 if (EventBindings::GetRenderThread())
512 retval = EventBindings::GetRenderThread()->IsExtensionProcess(); 512 retval = ExtensionDispatcher::Get()->is_extension_process();
513 return v8::Boolean::New(retval); 513 return v8::Boolean::New(retval);
514 } 514 }
515 515
516 static v8::Handle<v8::Value> IsIncognitoProcess(const v8::Arguments& args) { 516 static v8::Handle<v8::Value> IsIncognitoProcess(const v8::Arguments& args) {
517 bool retval = false; 517 bool retval = false;
518 if (EventBindings::GetRenderThread()) 518 if (EventBindings::GetRenderThread())
519 retval = EventBindings::GetRenderThread()->IsIncognitoProcess(); 519 retval = EventBindings::GetRenderThread()->IsIncognitoProcess();
520 return v8::Boolean::New(retval); 520 return v8::Boolean::New(retval);
521 } 521 }
522 }; 522 };
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 ExtensionProcessBindings::ThrowPermissionDeniedException( 649 ExtensionProcessBindings::ThrowPermissionDeniedException(
650 const std::string& function_name) { 650 const std::string& function_name) {
651 static const char kMessage[] = 651 static const char kMessage[] =
652 "You do not have permission to use '%s'. Be sure to declare" 652 "You do not have permission to use '%s'. Be sure to declare"
653 " in your manifest what permissions you need."; 653 " in your manifest what permissions you need.";
654 std::string error_msg = StringPrintf(kMessage, function_name.c_str()); 654 std::string error_msg = StringPrintf(kMessage, function_name.c_str());
655 655
656 return v8::ThrowException(v8::Exception::Error( 656 return v8::ThrowException(v8::Exception::Error(
657 v8::String::New(error_msg.c_str()))); 657 v8::String::New(error_msg.c_str())));
658 } 658 }
OLDNEW
« no previous file with comments | « chrome/renderer/extensions/extension_dispatcher.cc ('k') | chrome/renderer/mock_render_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698