mash: Convert system tray logout button to wm common types

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 86 matching lines @@
 class DisplayManager;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
 class EventTransformationHandler;
 class FirstRunHelper;
 class GPUSupport;
 class HighContrastController;
 class KeyboardUI;
 class KeyboardUMAEventFilter;
-class LastWindowClosedLogoutReminder;
 class LinkHandlerModelFactory;
 class LocaleNotificationController;
 class LockStateController;
 enum class LoginStatus;
-class LogoutConfirmationController;
 class MagnificationController;
 class MaximizeModeController;
 class MaximizeModeWindowManager;
 class MediaDelegate;
 class MouseCursorEventFilter;
 class MruWindowTracker;
 class NewWindowDelegate;
 class OverlayEventFilter;
 class PartialMagnificationController;
 class PointerWatcherDelegate;
@@ skipping 365 matching lines @@
     return display_configurator_.get();
   }
   DisplayErrorObserver* display_error_observer() {
     return display_error_observer_.get();
   }
 
   ResolutionNotificationController* resolution_notification_controller() {
     return resolution_notification_controller_.get();
   }
 
-  LogoutConfirmationController* logout_confirmation_controller() {
-    return logout_confirmation_controller_.get();
-  }
-
   ScreenOrientationController* screen_orientation_controller() {
     return screen_orientation_controller_.get();
   }
 
   VirtualKeyboardController* virtual_keyboard_controller() {
     return virtual_keyboard_controller_.get();
   }
 
   chromeos::AudioA11yController* audio_a11y_controller() {
     return audio_a11y_controller_.get();
@@ skipping 180 matching lines @@
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<PowerEventObserver> power_event_observer_;
   std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
   std::unique_ptr<VideoActivityNotifier> video_activity_notifier_;
   std::unique_ptr<StickyKeysController> sticky_keys_controller_;
   std::unique_ptr<ResolutionNotificationController>
       resolution_notification_controller_;
   std::unique_ptr<BluetoothNotificationController>
       bluetooth_notification_controller_;
-  std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
-  std::unique_ptr<LastWindowClosedLogoutReminder>
-      last_window_closed_logout_reminder_;
   std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
   std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_;
   // Controls video output device state.
   std::unique_ptr<ui::DisplayConfigurator> display_configurator_;
   std::unique_ptr<DisplayColorManager> display_color_manager_;
   std::unique_ptr<DisplayErrorObserver> display_error_observer_;
   std::unique_ptr<ProjectingObserver> projecting_observer_;
 
   // Listens for output changes and updates the display manager.
   std::unique_ptr<DisplayChangeObserver> display_change_observer_;
@@ skipping 31 matching lines @@
   bool in_mus_ = false;
 
   std::unique_ptr<KeyboardUI> keyboard_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_