Dismiss action in tab modal dialogs.

chrome/browser/chromeos/ui/idle_logout_dialog_view.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/chromeos/ui/idle_logout_dialog_view.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 58 matching lines @@
   // called, in which case we reset g_instance there if not already reset.
   if (!g_instance) {
     g_instance = new IdleLogoutDialogView();
     g_instance->InitAndShow();
   }
 }
 
 // static
 void IdleLogoutDialogView::CloseDialog() {
   if (g_instance)
-    g_instance->Close();
+    g_instance->GetWidget()->Close();

[achuithb, 2013/07/29 17:56:38]

Shouldn't you be calling g_instance->Close() here?

[fdoray, 2013/07/29 18:38:38]

No. Calling g_instance->Close() wouldn't close the dialog. This line will
generate a call to DialogClientView::CanClose(), which will call Close() on
g_instance.   

 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Overridden from views::DialogDelegateView
 int IdleLogoutDialogView::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
 ui::ModalType IdleLogoutDialogView::GetModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 string16 IdleLogoutDialogView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_IDLE_LOGOUT_TITLE);
 }
 
+bool IdleLogoutDialogView::Close() {
+  if (timer_.IsRunning())
+    timer_.Stop();
+
+  // We just closed our dialog. The global
+  // instance is invalid now, set it to null.
+  g_instance = NULL;
+
+  return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // IdleLogoutDialog private methods
 IdleLogoutDialogView::IdleLogoutDialogView()
     : restart_label_(NULL),
       weak_ptr_factory_(this) {
   if (!IdleLogoutDialogView::provider_)
     IdleLogoutDialogView::provider_ = new IdleLogoutSettingsProvider();
 }
 
 IdleLogoutDialogView::~IdleLogoutDialogView() {
@@ skipping 48 matching lines @@
   GetWidget()->SetAlwaysOnTop(true);
   GetWidget()->Show();
 
   // Update countdown every 1 second.
   timer_.Start(FROM_HERE,
                IdleLogoutDialogView::provider_->GetCountdownUpdateInterval(),
                this,
                &IdleLogoutDialogView::UpdateCountdown);
 }
 
-void IdleLogoutDialogView::Close() {
-  DCHECK(GetWidget());
-
-  if (timer_.IsRunning())
-    timer_.Stop();
-  GetWidget()->Close();
-
-  // We just closed our dialog. The global
-  // instance is invalid now, set it to null.
-  g_instance = NULL;
-}
-
 void IdleLogoutDialogView::UpdateCountdown() {
   base::TimeDelta logout_warning_time = countdown_end_time_ -
                                         base::Time::Now();
   int64 seconds_left = (logout_warning_time.InMillisecondsF() /
                         base::Time::kMillisecondsPerSecond) + 0.5;
 
   if (seconds_left > 1) {
     restart_label_->SetText(l10n_util::GetStringFUTF16(
         IDS_IDLE_LOGOUT_WARNING_RESTART,
         base::Int64ToString16(seconds_left)));
@@ skipping 16 matching lines @@
   return g_instance;
 }
 
 // static
 void IdleLogoutDialogView::set_settings_provider(
     IdleLogoutSettingsProvider* provider) {
   provider_ = provider;
 }
 
 }  // namespace chromeos