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

ash/system/logout_button/logout_button_tray.cc

Index: ash/system/logout_button/logout_button_tray.cc
diff --git a/ash/system/logout_button/logout_button_tray.cc b/ash/system/logout_button/logout_button_tray.cc
index c06073040c5c26822b641ecb479f29c65cae088f..122cb782ffbd21a8ff7eda2137fb68c51049717a 100644
--- a/ash/system/logout_button/logout_button_tray.cc
+++ b/ash/system/logout_button/logout_button_tray.cc
@@ -6,6 +6,7 @@
 
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
+#include "ash/system/logout_button/logout_confirmation_dialog_view.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ -96,18 +97,39 @@ 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),
+      weak_factory_(this) {
   button_ = new LogoutButton(this);
   tray_container()->AddChildView(button_);
   tray_container()->set_border(NULL);
-  Shell::GetInstance()->system_tray_notifier()->AddLogoutButtonObserver(this);
+  // For testing purpose.
+  if (Shell::HasInstance())
+    Shell::GetInstance()->system_tray_notifier()->AddLogoutButtonObserver(this);
 }
 
 LogoutButtonTray::~LogoutButtonTray() {
-  Shell::GetInstance()->system_tray_notifier()->
-      RemoveLogoutButtonObserver(this);
+  EnsureConfirmationDialogIsClosed();
+  if (Shell::HasInstance())
+    Shell::GetInstance()->system_tray_notifier()->
+        RemoveLogoutButtonObserver(this);
+}
+
+void LogoutButtonTray::EnsureConfirmationDialogIsShowing() {
+  if (!confirmation_dialog_) {
+    confirmation_dialog_.reset(new LogoutConfirmationDialogView(
+          weak_factory_.GetWeakPtr()));
+    confirmation_dialog_->Show(dialog_duration_);
+  }
+}
+
+void LogoutButtonTray::EnsureConfirmationDialogIsClosed() {
+  if (confirmation_dialog_ && Shell::HasInstance())
+    confirmation_dialog_->GetWidget()->Close();
+}
+
+bool LogoutButtonTray::IsConfirmationDialogShowing() {
+  return (bool)confirmation_dialog_;

[bartfab (slow), 2013/12/03 19:46:04]

Nit: We use C++-style casts. In this case though, no explicit casting is needed
at all. You can just do:

return confirmation_dialog_;

[binjin, 2013/12/04 10:47:03]

Done.

 }
 
 void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
@@ -132,10 +154,16 @@ void LogoutButtonTray::OnShowLogoutButtonInTrayChanged(bool 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();
+  OnUserLogoutEvent();
 }
 
 void LogoutButtonTray::UpdateAfterLoginStatusChange(
@@ -148,11 +176,30 @@ void LogoutButtonTray::UpdateAfterLoginStatusChange(
   UpdateVisibility();
 }
 
+void LogoutButtonTray::DeleteConfirmationDialog() {
+  confirmation_dialog_.reset();
+}
+
+void LogoutButtonTray::OnUserLogoutEvent() {
+  // Sign out immediately if kLogoutDialogDurationMs is non-positive.
+  if (dialog_duration_ <= base::TimeDelta::FromSeconds(0))
+    LogoutConfirmationDialogView::GetProvider()->LogoutCurrentUser(NULL);
+  else
+    EnsureConfirmationDialogIsShowing();
+}
+
+LogoutConfirmationDialogView *LogoutButtonTray::GetConfirmationDialog() {
+  return confirmation_dialog_.get();
+}
+
 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
+

[bartfab (slow), 2013/12/03 19:46:04]

Nit: No blank line needed.

[binjin, 2013/12/04 10:47:03]

Done.

 }  // namespace ash