mash: Convert system tray logout button to wm common types

ash/shell.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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 121 matching lines @@
 #include "ash/display/display_color_manager_chromeos.h"
 #include "ash/display/display_error_observer_chromeos.h"
 #include "ash/display/projecting_observer_chromeos.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h"
 #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"
 #include "base/sys_info.h"
 #include "chromeos/audio/audio_a11y_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/chromeos/user_activity_power_manager_notifier.h"
 #include "ui/display/chromeos/display_configurator.h"
 
 #if defined(USE_X11)
@@ skipping 526 matching lines @@
 // to but no longer cares about.
 #if defined(OS_CHROMEOS)
   virtual_keyboard_controller_.reset();
 #endif
 
   // Destroy maximize mode controller early on since it has some observers which
   // need to be removed.
   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
   // layout.
   DeactivateKeyboard();
 
   // Destroy toasts
   toast_manager_.reset();
 
   // 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();
 
   // Drag-and-drop must be canceled prior to close all windows.
   drag_drop_controller_.reset();
 
 // Controllers who have WindowObserver added must be deleted
 // before |window_tree_host_manager_| is deleted.
 
@@ skipping 331 matching lines @@
   DCHECK(system_tray_delegate);
   wm_shell_->SetSystemTrayDelegate(base::WrapUnique(system_tray_delegate));
 
   locale_notification_controller_.reset(new LocaleNotificationController);
 
   // Initialize toast manager
   toast_manager_.reset(new ToastManager);
 
 #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()
   // since TouchTransformerController listens on
   // WindowTreeHostManager::Observer::OnDisplaysInitialized().
   if (!in_mus_)
     touch_transformer_controller_.reset(new TouchTransformerController());
 #endif  // defined(OS_CHROMEOS)
 
   keyboard_ui_ = init_params.keyboard_factory.is_null()
@@ skipping 30 matching lines @@
   accelerator_controller_->SetBrightnessControlDelegate(
       std::unique_ptr<BrightnessControlDelegate>(
           new system::BrightnessControllerChromeos));
 
   power_event_observer_.reset(new PowerEventObserver());
   user_activity_notifier_.reset(
       new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get()));
   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
   // order to create mirror window. Run it after the main message loop
   // is started.
   display_manager_->CreateMirrorWindowAsyncIfAny();
 
   FOR_EACH_OBSERVER(ShellObserver, *wm_shell_common_->shell_observers(),
                     OnShellInitialized());
 
@@ skipping 76 matching lines @@
 
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash