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

Unified Diff: content/renderer/render_view_impl.cc

Issue 131573003: Convert DomAutomationController from CppBoundClass to gin::Wrappable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 6 years, 11 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: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 0faf36066e10857dc89878d83f761325abf07c14..a2687675cf09db47a234f9381e0ae80ea43fffe9 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3665,18 +3665,11 @@ void RenderViewImpl::didClearWindowObject(WebFrame* frame) {
FOR_EACH_OBSERVER(RenderViewObserver, observers_,
DidClearWindowObject(frame));
- if (enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) {
- if (!dom_automation_controller_)
- dom_automation_controller_.reset(new DomAutomationController());
- dom_automation_controller_->set_message_sender(
- static_cast<RenderView*>(this));
- dom_automation_controller_->set_routing_id(routing_id());
- dom_automation_controller_->BindToJavascript(frame,
- "domAutomationController");
- }
-
- if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION)
- StatsCollectionController::Install(frame);
+ if (enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION)
+ DomAutomationController::Install(frame);
+
+ if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION)
+ StatsCollectionController::Install(frame);
}
void RenderViewImpl::didCreateDocumentElement(WebFrame* frame) {
« content/renderer/dom_automation_controller.h ('K') | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698