mash: Convert system tray logout button to wm common types

ash/common/wm_shell.h

 // Copyright 2016 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.
 
 #ifndef ASH_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 12 matching lines @@
 
 namespace ash {
 
 class AccessibilityDelegate;
 class DisplayInfo;
 class FocusCycler;
 class MruWindowTracker;
 class SessionStateDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
+class SystemTrayNotifier;
 class WindowResizer;
 class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
-class SystemTrayNotifier;
+class WmRootWindowController;
 class WmWindow;
 
 namespace wm {
 class WindowState;
 }
 
+#if defined(OS_CHROMEOS)
+class LogoutConfirmationController;
+#endif
+
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell {
  public:
   // This is necessary for a handful of places that is difficult to plumb
   // through context.
   static void Set(WmShell* instance);
   static WmShell* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
@@ skipping 14 matching lines @@
 
   // Creates a new window used as a container of other windows. No painting is
   // done to the created window.
   virtual WmWindow* NewContainerWindow() = 0;
 
   virtual WmWindow* GetFocusedWindow() = 0;
   virtual WmWindow* GetActiveWindow() = 0;
 
   virtual WmWindow* GetPrimaryRootWindow() = 0;
 
+  // Convenience method. Returns the WmRootWindowController for the primary
+  // root window.
+  WmRootWindowController* GetPrimaryRootWindowController();
+
   // Returns the root window for the specified display.
   virtual WmWindow* GetRootWindowForDisplayId(int64_t display_id) = 0;
 
   // Returns the root window that newly created windows should be added to.
   // NOTE: this returns the root, newly created window should be added to the
   // appropriate container in the returned window.
   virtual WmWindow* GetRootWindowForNewWindows() = 0;
 
   // Retuns the display info associated with |display_id|.
   // TODO(msw): Remove this when DisplayManager has been moved. crbug.com/622480
@@ skipping 62 matching lines @@
   virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0;
   virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0;
 
   virtual void AddShellObserver(ShellObserver* observer) = 0;
   virtual void RemoveShellObserver(ShellObserver* observer) = 0;
 
   virtual void AddPointerWatcher(views::PointerWatcher* watcher) = 0;
   virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0;
 
 #if defined(OS_CHROMEOS)
+  LogoutConfirmationController* logout_confirmation_controller() {
+    return logout_confirmation_controller_.get();
+  }
+
   // TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
   virtual void ToggleIgnoreExternalKeyboard() = 0;
 #endif
 
  protected:
   WmShell();
   virtual ~WmShell();
 
   // If |delegate| is not null, sets and initializes the delegate. If |delegate|
   // is null, shuts down and destroys the delegate.
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
 
   void DeleteWindowSelectorController();
 
+#if defined(OS_CHROMEOS)
+  // Must be created after SystemTrayDelegate.

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

nit: // Must be created after and destroyed before SystemTrayDelegate.

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

Deleted these methods.

+  void CreateLogoutConfirmationController();
+  void DeleteLogoutConfirmationController();
+#endif
+
  private:
   friend class Shell;
 
   static WmShell* instance_;
 
   std::unique_ptr<FocusCycler> focus_cycler_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;
 
   bool simulate_modal_window_open_for_testing_ = false;
+
+#if defined(OS_CHROMEOS)
+  std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
+#endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_