mash: Convert system tray logout button to wm common types

ash/common/wm_shell.cc

 // 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.
 
 #include "ash/common/wm_shell.h"
 
 #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 {
 
 // static
 WmShell* WmShell::instance_ = nullptr;
 
 // static
 void WmShell::Set(WmShell* instance) {
   instance_ = instance;
 }
 
 // static
 WmShell* WmShell::Get() {
   return instance_;
 }
 
 WmShell::WmShell()
     : focus_cycler_(new FocusCycler),
       system_tray_notifier_(new SystemTrayNotifier),
       window_selector_controller_(new WindowSelectorController()) {}
 
 WmShell::~WmShell() {}
 
+WmRootWindowController* WmShell::GetPrimaryRootWindowController() {
+  return GetPrimaryRootWindow()->GetRootWindowController();
+}
+
 bool WmShell::IsSystemModalWindowOpen() {
   if (simulate_modal_window_open_for_testing_)
     return true;
 
   // Traverse all system modal containers, and find its direct child window
   // with "SystemModal" setting, and visible.
   for (WmWindow* root : GetAllRootWindows()) {
     WmWindow* system_modal =
         root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
     if (!system_modal)
       continue;
     for (const WmWindow* child : system_modal->GetChildren()) {
       if (child->IsSystemModal() && child->GetTargetVisibility()) {
         return true;
       }
     }
   }
   return false;
 }
 
 void WmShell::SetSystemTrayDelegate(
     std::unique_ptr<SystemTrayDelegate> delegate) {
-  if (delegate) {
-    DCHECK(!system_tray_delegate_);
-    // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common.
-    system_tray_delegate_ = std::move(delegate);
-    system_tray_delegate_->Initialize();
-  } else {
-    DCHECK(system_tray_delegate_);
-    system_tray_delegate_->Shutdown();
-    system_tray_delegate_.reset();
-  }
+  DCHECK(delegate);
+  DCHECK(!system_tray_delegate_);
+  // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common.
+  system_tray_delegate_ = std::move(delegate);
+  system_tray_delegate_->Initialize();
+#if defined(OS_CHROMEOS)
+  logout_confirmation_controller_.reset(new LogoutConfirmationController(
+      base::Bind(&SystemTrayDelegate::SignOut,
+                 base::Unretained(system_tray_delegate_.get()))));
+#endif
+}
+
+void WmShell::DeleteSystemTrayDelegate() {
+#if defined(OS_CHROMEOS)
+  logout_confirmation_controller_.reset();
+#endif
+  DCHECK(system_tray_delegate_);

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

optional nit: DCHECK at top?

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

Done.

+  system_tray_delegate_.reset();
 }
 
 void WmShell::DeleteWindowSelectorController() {
   window_selector_controller_.reset();
 }
 
 }  // namespace ash