Folds methods in WmShellCommon to WmShell

Folds methods in WmShellCommon to WmShell

And nukes WmShellCommon.

BUG=none
TEST=none
R=jamescook@chromium.org

Committed: https://crrev.com/d76167da283ac2d1820e6d72cf8d783089d1109c
Cr-Commit-Position: refs/heads/master@{#403357}

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

LGTM. So nice to see this getting folded in.

https://codereview.chromium.org/2115663002/diff/80001/ash/aura/wm_shell_aura.h
File ash/aura/wm_shell_aura.h (right):

https://codereview.chromium.org/2115663002/diff/80001/ash/aura/wm_shell_aura....
ash/aura/wm_shell_aura.h:68: friend class Shell;
Does it need to be a friend? It looks like you just need shell_observers(),
which is protected.

https://codereview.chromium.org/2115663002/diff/80001/ash/common/wm_shell.h
File ash/common/wm_shell.h (right):

https://codereview.chromium.org/2115663002/diff/80001/ash/common/wm_shell.h#n...
ash/common/wm_shell.h:77: MruWindowTracker* mru_window_tracker() { return
mru_window_tracker_.get(); }
nit: put after keyboard_ui (I'm trying to keep them alphabetical, since it's a
laundry list)

https://codereview.chromium.org/2115663002/diff/80001/ash/common/wm_shell.h#n...
ash/common/wm_shell.h:192: base::ObserverList<ShellObserver>* shell_observers()
{
nit: simple getter above SetKeyboardUI

https://codereview.chromium.org/2115663002/diff/80001/ash/common/wm_shell.h#n...
ash/common/wm_shell.h:220: std::unique_ptr<MruWindowTracker>
mru_window_tracker_;
ditto

[sky, 2016-06-30 21:49:26]

The CQ bit was checked by sky@chromium.org

[sky, 2016-06-30 21:49:29]

The patchset sent to the CQ was uploaded after l-g-t-m from
jamescook@chromium.org
Link to the patchset: https://codereview.chromium.org/2115663002/#ps100001
(title: "feedback")

[sky, 2016-06-30 21:49:42]

https://codereview.chromium.org/2115663002/diff/80001/ash/aura/wm_shell_aura.h
File ash/aura/wm_shell_aura.h (right):

https://codereview.chromium.org/2115663002/diff/80001/ash/aura/wm_shell_aura....
ash/aura/wm_shell_aura.h:68: friend class Shell;
On 2016/06/30 21:29:20, James Cook wrote:
> Does it need to be a friend? It looks like you just need shell_observers(),
> which is protected.

It's called from Shell, which is why I made this class friend Shell. But,
WmShell already has Shell as a friend, so this isn't needed. Removed.

https://codereview.chromium.org/2115663002/diff/80001/ash/common/wm_shell.h
File ash/common/wm_shell.h (right):

https://codereview.chromium.org/2115663002/diff/80001/ash/common/wm_shell.h#n...
ash/common/wm_shell.h:77: MruWindowTracker* mru_window_tracker() { return
mru_window_tracker_.get(); }
On 2016/06/30 21:29:20, James Cook wrote:
> nit: put after keyboard_ui (I'm trying to keep them alphabetical, since it's a
> laundry list)

Done, but similar comment to what I say below.

https://codereview.chromium.org/2115663002/diff/80001/ash/common/wm_shell.h#n...
ash/common/wm_shell.h:192: base::ObserverList<ShellObserver>* shell_observers()
{
On 2016/06/30 21:29:20, James Cook wrote:
> nit: simple getter above SetKeyboardUI

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.

https://codereview.chromium.org/2115663002/diff/80001/ash/common/wm_shell.h#n...
ash/common/wm_shell.h:220: std::unique_ptr<MruWindowTracker>
mru_window_tracker_;
On 2016/06/30 21:29:20, James Cook wrote:
> ditto

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

[commit-bot: I haz the power, 2016-06-30 21:50:03]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-30 22:36:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-30 22:36:32]

Failed to apply patch for ash/common/wm_shell.h:
While running git apply --index -3 -p1;
  error: patch failed: ash/common/wm_shell.h:12
  Falling back to three-way merge...
  Applied patch to 'ash/common/wm_shell.h' with conflicts.
  U ash/common/wm_shell.h

Patch:       ash/common/wm_shell.h
Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index
6a9632e2882ef997ea939453087b9a3c351ba0ec..543f85a7bb703aae8b6891a353729645920ce8a5
100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -12,6 +12,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/common/metrics/user_metrics_action.h"
+#include "base/observer_list.h"
 
 namespace gfx {
 class Rect;
@@ -61,6 +62,8 @@ class ASH_EXPORT WmShell {
 
   KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
 
+  MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
+
   SystemTrayNotifier* system_tray_notifier() {
     return system_tray_notifier_.get();
   }
@@ -73,8 +76,6 @@ class ASH_EXPORT WmShell {
     return window_selector_controller_.get();
   }
 
-  virtual MruWindowTracker* GetMruWindowTracker() = 0;
-
   // Creates a new window used as a container of other windows. No painting is
   // done to the created window.
   virtual WmWindow* NewContainerWindow() = 0;
@@ -152,6 +153,11 @@ class ASH_EXPORT WmShell {
   // 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;
@@ -162,8 +168,8 @@ class ASH_EXPORT WmShell {
   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;
@@ -181,6 +187,10 @@ class ASH_EXPORT WmShell {
   WmShell();
   virtual ~WmShell();
 
+  base::ObserverList<ShellObserver>* shell_observers() {
+    return &shell_observers_;
+  }
+
   void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui);
 
   // Sets and initializes the |delegate|.
@@ -189,13 +199,19 @@ class ASH_EXPORT WmShell {
 
   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<MruWindowTracker> mru_window_tracker_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;

[commit-bot: I haz the power, 2016-06-30 22:36:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-30 22:36:36]

CQ bit was unchecked.

[sky, 2016-06-30 23:16:49]

The CQ bit was checked by sky@chromium.org

[sky, 2016-06-30 23:16:49]

The patchset sent to the CQ was uploaded after l-g-t-m from
jamescook@chromium.org
Link to the patchset: https://codereview.chromium.org/2115663002/#ps120001
(title: "merge")

[commit-bot: I haz the power, 2016-06-30 23:17:25]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-01 00:05:51]

Committed patchset #7 (id:120001)

[commit-bot: I haz the power, 2016-07-01 00:05:59]

CQ bit was unchecked.

[commit-bot: I haz the power, 2016-07-01 00:09:02]

Description was changed from

==========
Folds methods in WmShellCommon to WmShell

And nukes WmShellCommon.

BUG=none
TEST=none
R=jamescook@chromium.org
==========

to

==========
Folds methods in WmShellCommon to WmShell

And nukes WmShellCommon.

BUG=none
TEST=none
R=jamescook@chromium.org

Committed: https://crrev.com/d76167da283ac2d1820e6d72cf8d783089d1109c
Cr-Commit-Position: refs/heads/master@{#403357}
==========

[commit-bot: I haz the power, 2016-07-01 00:09:04]

Patchset 7 (id:??) landed as
https://crrev.com/d76167da283ac2d1820e6d72cf8d783089d1109c
Cr-Commit-Position: refs/heads/master@{#403357}