Make ExtensionMsg_MessageInvoke run a module system function rather than a

chrome/renderer/extensions/extension_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/extensions/extension_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
+#include "base/values.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/console.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "chrome/renderer/extensions/miscellaneous_bindings.h"
 #include "chrome/renderer/extensions/user_script_scheduler.h"
 #include "chrome/renderer/extensions/user_script_slave.h"
@@ skipping 219 matching lines @@
                                           bool success,
                                           const base::ListValue& response,
                                           const std::string& error) {
   dispatcher_->OnExtensionResponse(request_id,
                                    success,
                                    response,
                                    error);
 }
 
 void ExtensionHelper::OnExtensionMessageInvoke(const std::string& extension_id,
+                                               const std::string& module_name,
                                                const std::string& function_name,
                                                const base::ListValue& args,
                                                bool user_gesture) {
   scoped_ptr<WebScopedUserGesture> web_user_gesture;
-  if (user_gesture) {
+  if (user_gesture)
     web_user_gesture.reset(new WebScopedUserGesture);
-  }
-
-  dispatcher_->v8_context_set().DispatchChromeHiddenMethod(
-      extension_id, function_name, args, render_view());
+  dispatcher_->v8_context_set().ForEach(

[koz (OOO until 15th September), 2013/05/31 04:28:44]

It feels a little weird to have to pass Dispatcher::CallModuleMethod like this.
Consider refactoring to look like

dispatcher_->v8_context_set()->CallModuleMethodOnAllContexts(...);

Or even

dispatcher_->CallModuleMethodOnAllContexts(...);

This would clean up a bunch of other ForEach() call sites, too. Up to you,
though.

[not at google - send to devlin, 2013/05/31 22:47:07]

I had decided to do it this way because there were the 3 different forms of
CallModuleMethod and it seems an arbitrary choice which of the forms to lift
onto ChromeV8Context - certainly I wouldn't lift a ListValue version onto it,
which is what all of these take.

However I agree it's weird. I'll factor this a bit differently and share the
concept at a higher level.

+      extension_id,
+      render_view(),
+      base::Bind(&Dispatcher::CallModuleMethod,
+                 module_name,
+                 function_name,
+                 &args));
 }
 
 void ExtensionHelper::OnExtensionDispatchOnConnect(
     int target_port_id,
     const std::string& channel_name,
     const base::DictionaryValue& source_tab,
     const ExtensionMsg_ExternalConnectionInfo& info) {
   MiscellaneousBindings::DispatchOnConnect(
       dispatcher_->v8_context_set().GetAll(),
       target_port_id, channel_name, source_tab,
@@ skipping 84 matching lines @@
 }
 
 void ExtensionHelper::OnAppWindowClosed() {
   v8::HandleScope scope;
   v8::Handle<v8::Context> script_context =
       render_view()->GetWebView()->mainFrame()->mainWorldScriptContext();
   ChromeV8Context* chrome_v8_context =
       dispatcher_->v8_context_set().GetByV8Context(script_context);
   if (!chrome_v8_context)
     return;
-  chrome_v8_context->CallChromeHiddenMethod("OnAppWindowClosed", 0, NULL, NULL);
+  chrome_v8_context->module_system()->CallModuleMethod(
+      "app.window", "onAppWindowClosed");
 }
 
 }  // namespace extensions