Implements the dialog view for logout button tray in public sessions.

ash/system/logout_button/logout_button_tray.cc

 // Copyright 2013 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 "ash/system/logout_button/logout_button_tray.h"
 
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_utils.h"
 #include "base/logging.h"
 #include "grit/ash_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/events/event.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/size.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/painter.h"
 
 namespace ash {
-
 namespace internal {
 
 namespace {
 
 const int kLogoutButtonHorizontalExtraPadding = 7;
 
 const int kLogoutButtonNormalImages[] = {
   IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_LEFT,
   IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP,
   IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_RIGHT,
@@ skipping 53 matching lines @@
   set_min_size(gfx::Size(0, GetShelfItemHeight()));
 }
 
 LogoutButton::~LogoutButton() {
 }
 
 LogoutButtonTray::LogoutButtonTray(StatusAreaWidget* status_area_widget)
     : TrayBackgroundView(status_area_widget),
       button_(NULL),
       login_status_(user::LOGGED_IN_NONE),
-      show_logout_button_in_tray_(false) {
+      show_logout_button_in_tray_(false),
+      confirmation_delegate_(new LogoutConfirmationDialogView::Delegate) {
   button_ = new LogoutButton(this);
   tray_container()->AddChildView(button_);
   tray_container()->set_border(NULL);
-  Shell::GetInstance()->system_tray_notifier()->AddLogoutButtonObserver(this);
+  // The Shell may not exist in some unit tests.
+  if (Shell::HasInstance()) {
+    Shell::GetInstance()->system_tray_notifier()->
+        AddLogoutButtonObserver(this);
+  }
 }
 
 LogoutButtonTray::~LogoutButtonTray() {
-  Shell::GetInstance()->system_tray_notifier()->
-      RemoveLogoutButtonObserver(this);
+  EnsureConfirmationDialogIsClosed();
+  // The Shell may not exist in some unit tests.
+  if (Shell::HasInstance()) {
+    Shell::GetInstance()->system_tray_notifier()->
+        RemoveLogoutButtonObserver(this);
+  }
+}
+
+bool LogoutButtonTray::IsConfirmationDialogShowing() const {
+  return confirmation_dialog_;
+}
+
+void LogoutButtonTray::EnsureConfirmationDialogIsShowing() {
+  if (!confirmation_dialog_) {
+    confirmation_dialog_.reset(new LogoutConfirmationDialogView(
+          this, confirmation_delegate_.get()));
+    confirmation_dialog_->Show(dialog_duration_);
+  }
+}
+
+void LogoutButtonTray::EnsureConfirmationDialogIsClosed() {
+  if (confirmation_dialog_)
+    confirmation_dialog_->DeleteDelegate();

[bartfab (slow), 2013/12/12 16:04:13]

Would it be possible to call confirmation_dialog_->Close() here instead? It
seems cleaner to tell the dialog to do an orderly close rather than forcing it
to delete immediately.

[binjin, 2013/12/17 10:29:49]

Done.

 }
 
 void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
   TrayBackgroundView::SetShelfAlignment(alignment);
   tray_container()->set_border(NULL);
 }
 
 base::string16 LogoutButtonTray::GetAccessibleNameForTray() {
   return button_->GetText();
 }
 
 void LogoutButtonTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {
 }
 
 bool LogoutButtonTray::ClickedOutsideBubble() {
   return false;
 }
 
 void LogoutButtonTray::OnShowLogoutButtonInTrayChanged(bool show) {
   show_logout_button_in_tray_ = show;
   UpdateVisibility();
 }
 
+void LogoutButtonTray::OnLogoutDialogDurationChanged(base::TimeDelta duration) {
+  dialog_duration_ = duration;
+  if (confirmation_dialog_)
+    confirmation_dialog_->UpdateDialogDuration(dialog_duration_);
+}
+
 void LogoutButtonTray::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   DCHECK_EQ(sender, button_);
-  Shell::GetInstance()->system_tray_delegate()->SignOut();
+  // Sign out immediately if |dialog_duration_| is non-positive.
+  if (dialog_duration_ <= base::TimeDelta())
+    confirmation_delegate_->LogoutCurrentUser();
+  else
+    EnsureConfirmationDialogIsShowing();
 }
 
 void LogoutButtonTray::UpdateAfterLoginStatusChange(
     user::LoginStatus login_status) {
   login_status_ = login_status;
   const base::string16 title =
       GetLocalizedSignOutStringForStatus(login_status, false);
   button_->SetText(title);
   button_->SetAccessibleName(title);
   UpdateVisibility();
 }
 
+void LogoutButtonTray::DeleteConfirmationDialog() {
+  ignore_result(confirmation_dialog_.release());
+}
+
+LogoutConfirmationDialogView* LogoutButtonTray::GetConfirmationDialogForTest() {
+  return confirmation_dialog_.get();
+}
+
+LogoutConfirmationDialogView::Delegate*
+LogoutButtonTray::GetConfirmationDelegateForTest() {
+  return confirmation_delegate_.get();
+}
+
+void LogoutButtonTray::SetDelegateForTest(
+    scoped_ptr<LogoutConfirmationDialogView::Delegate> delegate) {
+  confirmation_delegate_ = delegate.Pass();
+}
+
 void LogoutButtonTray::UpdateVisibility() {
   SetVisible(show_logout_button_in_tray_ &&
              login_status_ != user::LOGGED_IN_NONE &&
              login_status_ != user::LOGGED_IN_LOCKED);
+  if (!show_logout_button_in_tray_)
+    EnsureConfirmationDialogIsClosed();
 }
 
 }  // namespace internal
 }  // namespace ash