Folds methods in WmShellCommon to WmShell

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>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/metrics/user_metrics_action.h"
+#include "base/observer_list.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class PointerWatcher;
 }
 
 namespace ash {
@@ skipping 41 matching lines @@
   }
 
   SystemTrayDelegate* system_tray_delegate() {
     return system_tray_delegate_.get();
   }
 
   WindowSelectorController* window_selector_controller() {
     return window_selector_controller_.get();
   }
 
-  virtual MruWindowTracker* GetMruWindowTracker() = 0;
+  MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }

[James Cook, 2016/06/30 21:29:20]

nit: put after keyboard_ui (I'm trying to keep them alphabetical, since it's a
laundry list)

[sky, 2016/06/30 21:49:41]

Done, but similar comment to what I say below.

 
   // 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;
 
@@ skipping 58 matching lines @@
   virtual std::unique_ptr<wm::MaximizeModeEventHandler>
   CreateMaximizeModeEventHandler() = 0;
 
   // Called when the overview mode is about to be started (before the windows
   // get re-arranged).
   virtual void OnOverviewModeStarting() = 0;
 
   // Called after overview mode has ended.
   virtual void OnOverviewModeEnded() = 0;
 
+  // Notifies |observers_| when entering or exiting pinned mode for
+  // |pinned_window|. Entering or exiting can be checked by looking at
+  // |pinned_window|'s window state.
+  void NotifyPinnedStateChanged(WmWindow* pinned_window);
+
   virtual AccessibilityDelegate* GetAccessibilityDelegate() = 0;
 
   virtual SessionStateDelegate* GetSessionStateDelegate() = 0;
 
   virtual void AddActivationObserver(WmActivationObserver* observer) = 0;
   virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0;
 
   virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0;
   virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0;
 
-  virtual void AddShellObserver(ShellObserver* observer) = 0;
-  virtual void RemoveShellObserver(ShellObserver* observer) = 0;
+  void AddShellObserver(ShellObserver* observer);
+  void RemoveShellObserver(ShellObserver* observer);
 
   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();
 
   void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui);
 
+  base::ObserverList<ShellObserver>* shell_observers() {

[James Cook, 2016/06/30 21:29:20]

nit: simple getter above SetKeyboardUI

[sky, 2016/06/30 21:49:41]

Done. I will add though that sort of style is more a personal preference and is
going to be nigh impossible to enforce going forward.

+    return &shell_observers_;
+  }
+
   // Sets and initializes the |delegate|.
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
   void DeleteSystemTrayDelegate();
 
   void DeleteWindowSelectorController();
 
+  void CreateMruWindowTracker();
+  void DeleteMruWindowTracker();
+
  private:
   friend class Shell;
 
   static WmShell* instance_;
 
+  base::ObserverList<ShellObserver> shell_observers_;
+
   std::unique_ptr<FocusCycler> focus_cycler_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
   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;
 
+  std::unique_ptr<MruWindowTracker> mru_window_tracker_;

[James Cook, 2016/06/30 21:29:20]

ditto

[sky, 2016/06/30 21:49:41]

Done, and I'll ditto my nit from above;)

+
 #if defined(OS_CHROMEOS)
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
 #endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_