Converts mash to use Shell

ash/aura/wm_shell_aura.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_AURA_WM_SHELL_AURA_H_
 #define ASH_AURA_WM_SHELL_AURA_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/aura/wm_lookup_aura.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "ui/wm/public/activation_change_observer.h"
 
 namespace ash {
 
 class PointerWatcherAdapter;
 
 class ASH_EXPORT WmShellAura : public WmShell,
-                               public aura::client::ActivationChangeObserver,
                                public WindowTreeHostManager::Observer {
  public:
   explicit WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate);
   ~WmShellAura() override;
 
   static WmShellAura* Get();
 
-  void CreatePointerWatcherAdapter();
 
   // WmShell:
   void Shutdown() override;
   bool IsRunningInMash() const override;
   WmWindow* NewWindow(ui::wm::WindowType window_type,
                       ui::LayerType layer_type) override;
   WmWindow* GetFocusedWindow() override;
   WmWindow* GetActiveWindow() override;
   WmWindow* GetCaptureWindow() override;
   WmWindow* GetPrimaryRootWindow() override;
@@ skipping 26 matching lines @@
   std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler(
       WmWindow* workspace_window) override;
   std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
   CreateScopedDisableInternalMouseAndKeyboard() override;
   std::unique_ptr<ImmersiveFullscreenController>
   CreateImmersiveFullscreenController() override;
   std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override;
   void OnOverviewModeStarting() override;
   void OnOverviewModeEnded() override;
   SessionStateDelegate* GetSessionStateDelegate() override;
-  void AddActivationObserver(WmActivationObserver* observer) override;
-  void RemoveActivationObserver(WmActivationObserver* observer) override;
   void AddDisplayObserver(WmDisplayObserver* observer) override;
   void RemoveDisplayObserver(WmDisplayObserver* observer) override;
   void AddPointerWatcher(views::PointerWatcher* watcher,
                          views::PointerWatcherEventTypes events) override;
   void RemovePointerWatcher(views::PointerWatcher* watcher) override;
   void RequestShutdown() override;
   bool IsTouchDown() override;
   void ToggleIgnoreExternalKeyboard() override;
   void SetLaserPointerEnabled(bool enabled) override;
+  void CreatePointerWatcherAdapter() override;
+  void CreatePrimaryHost() override;
+  void InitHosts(const ShellInitParams& init_params) override;
 
  private:
-  // aura::client::ActivationChangeObserver:
-  void OnWindowActivated(ActivationReason reason,
-                         aura::Window* gained_active,
-                         aura::Window* lost_active) override;
-  void OnAttemptToReactivateWindow(aura::Window* request_active,
-                                   aura::Window* actual_active) override;
-
   // SessionStateObserver:
   void SessionStateChanged(session_manager::SessionState state) override;
 
   // WindowTreeHostManager::Observer:
   void OnDisplayConfigurationChanging() override;
   void OnDisplayConfigurationChanged() override;
 
   WmLookupAura wm_lookup_;
   std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
 
-  bool added_activation_observer_ = false;
-  base::ObserverList<WmActivationObserver> activation_observers_;
-
   bool added_display_observer_ = false;
   base::ObserverList<WmDisplayObserver> display_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShellAura);
 };
 
 }  // namespace ash
 
 #endif  // ASH_AURA_WM_SHELL_AURA_H_