Move remaining mus::WindowObserver lifecycle callbacks from PlatformWindowMus to NativeWidgetMus::M…

ui/views/mus/platform_window_mus.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 UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_
 #define UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 17 matching lines @@
 class Event;
 class ViewProp;
 }
 
 namespace views {
 
 // This class has been marked for deletion. Its implementation is being rolled
 // into views::NativeWidgetMus. See crbug.com/609555 for details.
 class VIEWS_MUS_EXPORT PlatformWindowMus
     : public NON_EXPORTED_BASE(ui::PlatformWindow),
-      public mus::WindowObserver,
       public NON_EXPORTED_BASE(mus::InputEventHandler) {
  public:
   PlatformWindowMus(ui::PlatformWindowDelegate* delegate,
                     shell::Connector* connector,
                     mus::Window* mus_window);
   ~PlatformWindowMus() override;
 
   // ui::PlatformWindow:
   void Show() override;
   void Hide() override;
   void Close() override;
   void SetBounds(const gfx::Rect& bounds) override;
   gfx::Rect GetBounds() override;
   void SetTitle(const base::string16& title) override;
   void SetCapture() override;
   void ReleaseCapture() override;
   void ToggleFullscreen() override;
   void Maximize() override;
   void Minimize() override;
   void Restore() override;
   void SetCursor(ui::PlatformCursor cursor) override;
   void MoveCursorTo(const gfx::Point& location) override;
   void ConfineCursorToBounds(const gfx::Rect& bounds) override;
   ui::PlatformImeController* GetPlatformImeController() override;
 
  private:
   friend class PlatformWindowMusTest;
 
-  // mus::WindowObserver:
-  void OnWindowDestroyed(mus::Window* window) override;
-  void OnWindowFocusChanged(mus::Window* gained_focus,
-                            mus::Window* lost_focus) override;
-  void OnRequestClose(mus::Window* window) override;
-
   // mus::InputEventHandler:
   void OnWindowInputEvent(
       mus::Window* view,
       const ui::Event& event,
       std::unique_ptr<base::Callback<void(mus::mojom::EventResult)>>*
           ack_callback) override;
 
   ui::PlatformWindowDelegate* delegate_;
   mus::Window* mus_window_;
 
   // True if OnWindowDestroyed() has been received.
   bool mus_window_destroyed_;
 
   std::unique_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_;
   std::unique_ptr<ui::ViewProp> prop_;
 #ifndef NDEBUG
   std::unique_ptr<base::WeakPtrFactory<PlatformWindowMus>> weak_factory_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(PlatformWindowMus);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_