Don't listen for NOTIFICATION_TAB_CLOSING in TabModalConfirmDialogDelegate

chrome/browser/ui/tab_modal_confirm_dialog_delegate.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/browser/ui/tab_modal_confirm_dialog_delegate.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::NavigationController;
 using content::WebContents;
 
 TabModalConfirmDialogDelegate::TabModalConfirmDialogDelegate(
     WebContents* web_contents)
     : close_delegate_(NULL),
       closing_(false) {
   NavigationController* controller = &web_contents->GetController();
   registrar_.Add(this, content::NOTIFICATION_LOAD_START,
                  content::Source<NavigationController>(controller));
-  registrar_.Add(this, chrome::NOTIFICATION_TAB_CLOSING,
-                 content::Source<NavigationController>(controller));
 }
 
 TabModalConfirmDialogDelegate::~TabModalConfirmDialogDelegate() {
   // If we end up here, the window has been closed, so make sure we don't close
   // it again.
   close_delegate_ = NULL;
   // Make sure everything is cleaned up.
   Cancel();
 }
 
@@ skipping 23 matching lines @@
   closing_ = true;
   OnLinkClicked(disposition);
   CloseDialog();
 }
 
 void TabModalConfirmDialogDelegate::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   // Close the dialog if we load a page (because the action might not apply to
-  // the same page anymore) or if the tab is closed.
-  if (type == content::NOTIFICATION_LOAD_START ||
-      type == chrome::NOTIFICATION_TAB_CLOSING) {
-    Close();
-  } else {
-    NOTREACHED();
-  }
+  // the same page anymore).
+  DCHECK(type == content::NOTIFICATION_LOAD_START);

[sky, 2013/09/04 14:12:51]

DCHECK_EQ

[Mike Wittman, 2013/09/04 16:59:28]

Done.

+
+  Close();
 }
 
 void TabModalConfirmDialogDelegate::Close() {
   if (closing_)
     return;
   // Make sure we won't do anything when another action occurs.
   closing_ = true;
   OnClosed();
   CloseDialog();
 }
@@ skipping 32 matching lines @@
     WindowOpenDisposition disposition) {
 }
 
 void TabModalConfirmDialogDelegate::OnClosed() {
 }
 
 void TabModalConfirmDialogDelegate::CloseDialog() {
   if (close_delegate_)
     close_delegate_->CloseDialog();
 }