mash: Convert system tray logout button to wm common types

ash/common/wm_shell.cc

Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index 4aa534e580fcae74d6ff84b133f6cdcfbf9defcb..37217350af224655a301ecc18e136218289d00fb 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -6,10 +6,12 @@
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_window.h"
+#include "base/bind.h"
 #include "base/logging.h"
 
 namespace ash {
@@ -34,6 +36,10 @@ WmShell::WmShell()
 
 WmShell::~WmShell() {}
 
+WmRootWindowController* WmShell::GetPrimaryRootWindowController() {

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

I have concerns about making this easy for non-test code (similar to primary
shelf/tray/etc)... can callers just inline this operation? will there be many?

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

Inlined it. There will be a few, but forcing them to inline probably provides
good pressure in the direction we want to go.

[msw, 2016/06/28 21:09:16]

Please actually remove this function; otherwise nice.

[James Cook, 2016/06/28 21:41:02]

Doh, forgot to actually remove it! Done.

+  return GetPrimaryRootWindow()->GetRootWindowController();
+}
+
 bool WmShell::IsSystemModalWindowOpen() {
   if (simulate_modal_window_open_for_testing_)
     return true;
@@ -72,4 +78,18 @@ void WmShell::DeleteWindowSelectorController() {
   window_selector_controller_.reset();
 }
 
+#if defined(OS_CHROMEOS)
+void WmShell::CreateLogoutConfirmationController() {
+  DCHECK(system_tray_delegate_);
+  logout_confirmation_controller_.reset(new LogoutConfirmationController(
+      base::Bind(&SystemTrayDelegate::SignOut,
+                 base::Unretained(system_tray_delegate_.get()))));
+}
+
+void WmShell::DeleteLogoutConfirmationController() {
+  DCHECK(system_tray_delegate_);
+  logout_confirmation_controller_.reset();
+}
+#endif  // defined(OS_CHROMEOS)
+
 }  // namespace ash