Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

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 "ash/root_window_controller.h"
 #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/interfaces/display/display_controller.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
-#include "ui/aura/env_observer.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 
 namespace aura {
 namespace client {
 class ActivationClient;
 }
 }
 
 namespace base {
@@ skipping 31 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 aura::WindowManagerDelegate,
-                      public aura::WindowTreeClientDelegate,
-                      public aura::EnvObserver {
+                      public aura::WindowTreeClientDelegate {
  public:
   explicit WindowManager(service_manager::Connector* connector);
   ~WindowManager() override;
 
   void Init(std::unique_ptr<aura::WindowTreeClient> window_tree_client,
             const scoped_refptr<base::SequencedWorkerPool>& blocking_pool);
 
   WmShellMus* shell() { return shell_.get(); }
 
   ScreenMus* screen() { return screen_.get(); }
@@ skipping 93 matching lines @@
                            const gfx::Point& cursor_location,
                            const base::Callback<void(bool)>& on_done) override;
   void OnWmCancelMoveLoop(aura::Window* window) override;
   ui::mojom::EventResult OnAccelerator(uint32_t id,
                                        const ui::Event& event) override;
   void OnWmSetClientArea(
       aura::Window* window,
       const gfx::Insets& insets,
       const std::vector<gfx::Rect>& additional_client_areas) override;
 
-  // aura::EnvObserver:
-  void OnWindowInitialized(aura::Window* window) override;
-
   service_manager::Connector* connector_;
   display::mojom::DisplayControllerPtr display_controller_;
 
   std::unique_ptr<::wm::FocusController> focus_controller_;
   std::unique_ptr<::wm::WMState> wm_state_;
   std::unique_ptr<aura::PropertyConverter> property_converter_;
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
 
   aura::WindowManagerClient* window_manager_client_ = nullptr;
@@ skipping 20 matching lines @@
 
   std::unique_ptr<ScreenPositionController> screen_position_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_