mash: Migrate shelf app list 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 13 matching lines @@
 class AccessibilityDelegate;
 class BrightnessControlDelegate;
 class DisplayInfo;
 class FocusCycler;
 class KeyboardBrightnessControlDelegate;
 class KeyboardUI;
 class MaximizeModeController;
 class MruWindowTracker;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionStateDelegate;
+class ShelfModel;
 class ShellDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class SystemTrayNotifier;
 class WindowCycleController;
 class WindowCycleEventFilter;
 class WindowResizer;
 class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
@@ skipping 41 matching lines @@
   KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
 
   MaximizeModeController* maximize_mode_controller() {
     return maximize_mode_controller_.get();
   }
 
   MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
 
   MediaDelegate* media_delegate() { return media_delegate_.get(); }
 
+  ShelfModel* shelf_model() { return shelf_model_.get(); }
+
   SystemTrayNotifier* system_tray_notifier() {
     return system_tray_notifier_.get();
   }
 
   SystemTrayDelegate* system_tray_delegate() {
     return system_tray_delegate_.get();
   }
 
   WindowCycleController* window_cycle_controller() {
     return window_cycle_controller_.get();
@@ skipping 34 matching lines @@
   virtual bool IsForceMaximizeOnFirstRun() = 0;
 
   // Returns true if a system-modal dialog window is currently open.
   bool IsSystemModalWindowOpen();
 
   // For testing only: set simulation that a modal window is open
   void SimulateModalWindowOpenForTesting(bool modal_window_open) {
     simulate_modal_window_open_for_testing_ = modal_window_open;
   }
 
+  // Shows the app list on the active root window.
+  void ShowAppList();
+
+  // Dismisses the app list.
+  void DismissAppList();
+
+  // Shows the app list if it's not visible. Dismisses it otherwise.
+  void ToggleAppList();

[msw, 2016/07/20 17:33:49]

optional nit: This only really has two callers (HandleToggleAppList in
accelerator_controller.cc and AppListShelfItemDelegate::ItemSelected); it could
be removed and those places could call into the presenter directly or inline
similar behavior and then even the presenter method could go away.

[James Cook, 2016/07/20 18:35:39]

I'm going to keep the applist functions as-is. It feels like either WmShell
should expose all 5, or it should just expose the AppListPresenter, and doing
the latter involving inlining the default-display-lookup code in a bunch of
places.

+
+  // Returns app list actual visibility. This might differ from
+  // GetAppListTargetVisibility() when hiding animation is still in flight.

[msw, 2016/07/20 17:33:49]

optional nit: It'd also be nice to only have a single function for visibility.

+  bool IsApplistVisible() const;
+
+  // Returns app list target visibility.
+  bool GetAppListTargetVisibility() const;
+
   // Returns true if a window is currently pinned.
   virtual bool IsPinned() = 0;
 
   // Sets/Unsets the |window| to as a pinned window. If this is called with a
   // window with WINDOW_STATE_TYPE_PINNED state, then this sets the |window|
   // as a pinned window. Otherwise, this unsets it.
   // For setting, a caller needs to guarantee that no windows are set
   // as pinned window. For unsetting, a caller needs to guarantee that the
   // |window| is the one which is currently set as a pinned window via previous
   // this function invocation.
@@ skipping 111 matching lines @@
 
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
   std::unique_ptr<FocusCycler> focus_cycler_;
   std::unique_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
   std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaDelegate> media_delegate_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
+  std::unique_ptr<ShelfModel> shelf_model_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<WindowCycleController> window_cycle_controller_;
   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_