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

Unified Diff: content/browser/web_contents/interstitial_page_impl.h

Issue 14651029: content: Remove usage of NOTIFICATION_WEB_CONTENTS_DESTROYED from content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo, rebase Created 7 years, 7 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/web_contents/interstitial_page_impl.h
diff --git a/content/browser/web_contents/interstitial_page_impl.h b/content/browser/web_contents/interstitial_page_impl.h
index 2b3108a8e30fc424ef590e35899e838b32ea97d7..532dcc293ff37d506a32c404a1669692dc9b09b4 100644
--- a/content/browser/web_contents/interstitial_page_impl.h
+++ b/content/browser/web_contents/interstitial_page_impl.h
@@ -14,6 +14,7 @@
#include "content/public/browser/interstitial_page.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/renderer_preferences.h"
#include "googleurl/src/gurl.h"
@@ -33,6 +34,7 @@ enum ResourceRequestAction {
class CONTENT_EXPORT InterstitialPageImpl
: public NON_EXPORTED_BASE(InterstitialPage),
public NotificationObserver,
+ public WebContentsObserver,
public RenderViewHostDelegate,
public RenderWidgetHostDelegate {
public:
@@ -89,6 +91,9 @@ class CONTENT_EXPORT InterstitialPageImpl
const NotificationSource& source,
const NotificationDetails& details) OVERRIDE;
+ // WebContentsObserver implementation:
+ virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE;
+
// RenderViewHostDelegate implementation:
virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE;
virtual const GURL& GetURL() const OVERRIDE;
@@ -162,6 +167,8 @@ class CONTENT_EXPORT InterstitialPageImpl
// Shutdown the RVH. We will be deleted by the time this method returns.
void Shutdown(RenderViewHostImpl* render_view_host);
+ void OnNavigatingAwayOrTabClosing();
+
// Executes the passed action on the ResourceDispatcher (on the IO thread).
// Used to block/resume/cancel requests for the RenderViewHost hidden by this
// interstitial.

Powered by Google App Engine
This is Rietveld 408576698