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

Unified Diff: chrome/renderer/extensions/extension_helper.cc

Issue 240603003: Remove ChromeV8Extension & most of ChromeV8Context (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/extensions/extension_helper.cc
diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc
index a4f27ddba3e9a0186ec7c5cac6de65e79a610415..592f723f2ff4e4ed8684abc5e4d04ee20bb5f7ea 100644
--- a/chrome/renderer/extensions/extension_helper.cc
+++ b/chrome/renderer/extensions/extension_helper.cc
@@ -279,26 +279,32 @@ void ExtensionHelper::OnExtensionDispatchOnConnect(
const ExtensionMsg_ExternalConnectionInfo& info,
const std::string& tls_channel_id) {
MessagingBindings::DispatchOnConnect(
- dispatcher_->v8_context_set().GetAll(),
- target_port_id, channel_name, source_tab,
- info.source_id, info.target_id, info.source_url,
- tls_channel_id, render_view());
+ dispatcher_->script_context_set().GetAll(),
+ target_port_id,
+ channel_name,
+ source_tab,
+ info.source_id,
+ info.target_id,
+ info.source_url,
+ tls_channel_id,
+ render_view());
}
void ExtensionHelper::OnExtensionDeliverMessage(int target_id,
const Message& message) {
- MessagingBindings::DeliverMessage(dispatcher_->v8_context_set().GetAll(),
- target_id,
- message,
- render_view());
+ MessagingBindings::DeliverMessage(dispatcher_->script_context_set().GetAll(),
+ target_id,
+ message,
+ render_view());
}
void ExtensionHelper::OnExtensionDispatchOnDisconnect(
int port_id,
const std::string& error_message) {
MessagingBindings::DispatchOnDisconnect(
- dispatcher_->v8_context_set().GetAll(),
- port_id, error_message,
+ dispatcher_->script_context_set().GetAll(),
+ port_id,
+ error_message,
render_view());
}
@@ -368,14 +374,14 @@ void ExtensionHelper::OnAddMessageToConsole(ConsoleMessageLevel level,
void ExtensionHelper::OnAppWindowClosed() {
v8::HandleScope scope(v8::Isolate::GetCurrent());
- v8::Handle<v8::Context> script_context =
+ v8::Handle<v8::Context> v8_context =
render_view()->GetWebView()->mainFrame()->mainWorldScriptContext();
- ChromeV8Context* chrome_v8_context =
- dispatcher_->v8_context_set().GetByV8Context(script_context);
- if (!chrome_v8_context)
+ ScriptContext* script_context =
+ dispatcher_->script_context_set().GetByV8Context(v8_context);
+ if (!script_context)
return;
- chrome_v8_context->module_system()->CallModuleMethod(
- "app.window", "onAppWindowClosed");
+ script_context->module_system()->CallModuleMethod("app.window",
+ "onAppWindowClosed");
not at google - send to devlin 2014/04/17 15:11:10 this method looks unnecessary. it doesn't even nee
koz (OOO until 15th September) 2014/04/22 00:13:38 I think it's good to move away from calling JS met
not at google - send to devlin 2014/04/22 00:15:38 That makes sense.
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698