Folds methods in WmShellCommon to WmShell

ash/aura/wm_shell_aura.h

Index: ash/aura/wm_shell_aura.h
diff --git a/ash/aura/wm_shell_aura.h b/ash/aura/wm_shell_aura.h
index c1084360061100fc0034c9ba22674187d66d01fa..745042fa8d64737c2b647eae770ade592906e9a0 100644
--- a/ash/aura/wm_shell_aura.h
+++ b/ash/aura/wm_shell_aura.h
@@ -15,14 +15,13 @@
 
 namespace ash {
 
-class WmShellCommon;
+class Shell;
 
 class ASH_EXPORT WmShellAura : public WmShell,
                                public aura::client::ActivationChangeObserver,
                                public WindowTreeHostManager::Observer {
  public:
-  // |shell_common| is not owned by this class and must outlive this class.
-  explicit WmShellAura(WmShellCommon* wm_shell_common);
+  WmShellAura();
   ~WmShellAura() override;
 
   static WmShellAura* Get();
@@ -31,7 +30,6 @@ class ASH_EXPORT WmShellAura : public WmShell,
   void PrepareForShutdown();
 
   // WmShell:
-  MruWindowTracker* GetMruWindowTracker() override;
   WmWindow* NewContainerWindow() override;
   WmWindow* GetFocusedWindow() override;
   WmWindow* GetActiveWindow() override;
@@ -60,8 +58,6 @@ class ASH_EXPORT WmShellAura : public WmShell,
   void RemoveActivationObserver(WmActivationObserver* observer) override;
   void AddDisplayObserver(WmDisplayObserver* observer) override;
   void RemoveDisplayObserver(WmDisplayObserver* observer) override;
-  void AddShellObserver(ShellObserver* observer) override;
-  void RemoveShellObserver(ShellObserver* observer) override;
   void AddPointerWatcher(views::PointerWatcher* watcher) override;
   void RemovePointerWatcher(views::PointerWatcher* watcher) override;
 #if defined(OS_CHROMEOS)
@@ -69,6 +65,8 @@ class ASH_EXPORT WmShellAura : public WmShell,
 #endif
 
  private:
+  friend class Shell;

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

Does it need to be a friend? It looks like you just need shell_observers(),
which is protected.

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

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.

+
   // aura::client::ActivationChangeObserver:
   void OnWindowActivated(ActivationReason reason,
                          aura::Window* gained_active,
@@ -80,9 +78,6 @@ class ASH_EXPORT WmShellAura : public WmShell,
   void OnDisplayConfigurationChanging() override;
   void OnDisplayConfigurationChanged() override;
 
-  // Owned by Shell.
-  WmShellCommon* wm_shell_common_;
-
   WmLookupAura wm_lookup_;
   bool added_activation_observer_ = false;
   base::ObserverList<WmActivationObserver> activation_observers_;