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

Unified Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 157713002: Switch DomAutomationController to be a RenderFrameObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nasko@ CR feedback Created 6 years, 10 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/browser/frame_host/interstitial_page_impl.cc
diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc
index 41470a421e55ecf31507396cc318b61e01f48516..e46ed84e8ec85f53cdee62ce8a89f65cb6fb9fe9 100644
--- a/content/browser/frame_host/interstitial_page_impl.cc
+++ b/content/browser/frame_host/interstitial_page_impl.cc
@@ -249,9 +249,6 @@ void InterstitialPageImpl::Show() {
notification_registrar_.Add(this, NOTIFICATION_NAV_ENTRY_PENDING,
Source<NavigationController>(controller_));
- notification_registrar_.Add(
- this, NOTIFICATION_DOM_OPERATION_RESPONSE,
- Source<RenderViewHost>(render_view_host_));
}
void InterstitialPageImpl::Hide() {
@@ -346,13 +343,6 @@ void InterstitialPageImpl::Observe(
TakeActionOnResourceDispatcher(CANCEL);
}
break;
- case NOTIFICATION_DOM_OPERATION_RESPONSE:
- if (enabled()) {
- Details<DomOperationNotificationDetails> dom_op_details(
- details);
- delegate_->CommandReceived(dom_op_details->json);
- }
- break;
default:
NOTREACHED();
}
@@ -375,6 +365,18 @@ void InterstitialPageImpl::RenderFrameCreated(
render_frame_host);
}
+void InterstitialPageImpl::OnDomOperationResponse(
+ const DomOperationNotificationDetails& details) {
+ // Needed by test code.
+ NotificationService::current()->Notify(
+ NOTIFICATION_DOM_OPERATION_RESPONSE,
+ Source<WebContents>(web_contents()),
+ Details<const DomOperationNotificationDetails>(&details));
+ if (!enabled())
+ return;
+ delegate_->CommandReceived(details.json);
+}
+
RenderViewHostDelegateView* InterstitialPageImpl::GetDelegateView() {
return rvh_delegate_view_.get();
}

Powered by Google App Engine
This is Rietveld 408576698