Centralizes more shared code between ash and mash

ash/mus/window_manager.h

 // Copyright 2015 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_MUS_WINDOW_MANAGER_H_
 #define ASH_MUS_WINDOW_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "services/ui/common/types.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
-#include "services/ui/public/cpp/window_observer.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 
 namespace base {
 class SequencedWorkerPool;
 }
 
 namespace display {
 class Display;
 class ScreenBase;
@@ skipping 16 matching lines @@
 class WindowManagerObserver;
 class WmShellMus;
 class WmLookupMus;
 class WmTestHelper;
 
 // WindowManager serves as the WindowManagerDelegate and
 // WindowTreeClientDelegate for mash. WindowManager creates (and owns)
 // a RootWindowController per Display. WindowManager takes ownership of
 // the WindowTreeClient.
 class WindowManager : public ui::WindowManagerDelegate,
-                      public ui::WindowObserver,
                       public ui::WindowTreeClientDelegate {
  public:
   explicit WindowManager(shell::Connector* connector);
   ~WindowManager() override;
 
   void Init(std::unique_ptr<ui::WindowTreeClient> window_tree_client,
             const scoped_refptr<base::SequencedWorkerPool>& blocking_pool);
 
   WmShellMus* shell() { return shell_.get(); }
 
@@ skipping 40 matching lines @@
       RootWindowController* root_window_controller);
 
   void Shutdown();
 
   // Returns an iterator into |root_window_controllers_|. Returns
   // root_window_controllers_.end() if |window| is not the root of a
   // RootWindowController.
   RootWindowControllers::iterator FindRootWindowControllerByWindow(
       ui::Window* window);
 
-  // ui::WindowObserver:
-  void OnWindowDestroying(ui::Window* window) override;
-  void OnWindowDestroyed(ui::Window* window) override;
+  RootWindowController* GetPrimaryRootWindowController();
 
   // WindowTreeClientDelegate:
   void OnEmbed(ui::Window* root) override;
   void OnEmbedRootDestroyed(ui::Window* root) override;
   void OnLostConnection(ui::WindowTreeClient* client) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               ui::Window* target) override;
 
   // WindowManagerDelegate:
   void SetWindowManagerClient(ui::WindowManagerClient* client) override;
@@ skipping 41 matching lines @@
   std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
   uint16_t next_accelerator_namespace_id_ = 0u;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_