mash: Convert system tray logout button to wm common types

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 7ca36a929f4c7d1b25204bcb72c67e968dc42b39..9c8f300a50333f7e8a82da75d2cec2614c0866bf 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -139,8 +139,6 @@
 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h"
 #include "ash/system/chromeos/power/power_event_observer.h"
 #include "ash/system/chromeos/power/video_activity_notifier.h"
-#include "ash/system/chromeos/session/last_window_closed_logout_reminder.h"
-#include "ash/system/chromeos/session/logout_confirmation_controller.h"
 #include "ash/touch/touch_transformer_controller.h"
 #include "ash/virtual_keyboard_controller.h"
 #include "base/bind_helpers.h"
@@ -687,12 +685,8 @@ Shell::~Shell() {
   maximize_mode_controller_.reset();
 
 #if defined(OS_CHROMEOS)
-  // Destroy the LastWindowClosedLogoutReminder before the
-  // LogoutConfirmationController.
-  last_window_closed_logout_reminder_.reset();
-
   // Destroy the LogoutConfirmationController before the SystemTrayDelegate.
-  logout_confirmation_controller_.reset();
+  wm_shell_->DeleteLogoutConfirmationController();

[msw, 2016/06/28 19:31:04]

It's unfortunate that ash::Shell controls the lifetime order of objects in the
WmShell; hopefully we can clean this up when SystemTray moves... Or could the
Create/Delete just be part of SetSystemTrayDelegate (toggled by null or not?)

[James Cook, 2016/06/28 20:14:46]

I moved the creation/deletion into WmShell. I split SetSystemTrayDelegate() into
separate Set and Delete methods because it makes it more readable with the
chromeos ifdefs.

 #endif
 
   // Destroy the keyboard before closing the shelf, since it will invoke a shelf
@@ -705,7 +699,6 @@ Shell::~Shell() {
   // Destroy SystemTrayDelegate before destroying the status area(s). Make sure
   // to deinitialize the shelf first, as it is initialized after the delegate.
   ShutdownShelf();
-  wm_shell_->system_tray_delegate()->Shutdown();

[msw, 2016/06/28 19:31:04]

Nice, this is already part of WmShell::SetSystemTrayDelegate
(afaict, the impls are all no-ops, I wonder if we can remove it separately?)

[James Cook, 2016/06/28 20:14:46]

Removed the Shutdown() methods.

   wm_shell_->SetSystemTrayDelegate(nullptr);
 
   locale_notification_controller_.reset();
@@ -1057,9 +1050,7 @@ void Shell::Init(const ShellInitParams& init_params) {
 
 #if defined(OS_CHROMEOS)
   // Create the LogoutConfirmationController after the SystemTrayDelegate.
-  logout_confirmation_controller_.reset(new LogoutConfirmationController(
-      base::Bind(&SystemTrayDelegate::SignOut,
-                 base::Unretained(system_tray_delegate))));
+  wm_shell_->CreateLogoutConfirmationController();
 
   // Create TouchTransformerController before
   // WindowTreeHostManager::InitDisplays()
@@ -1110,7 +1101,6 @@ void Shell::Init(const ShellInitParams& init_params) {
   video_activity_notifier_.reset(
       new VideoActivityNotifier(video_detector_.get()));
   bluetooth_notification_controller_.reset(new BluetoothNotificationController);
-  last_window_closed_logout_reminder_.reset(new LastWindowClosedLogoutReminder);
   screen_orientation_controller_.reset(new ScreenOrientationController());
 #endif
   // The compositor thread and main message loop have to be running in