Replace WmWindowObserver with aura::WindowObserver.

ash/wm/video_detector.cc

 // Copyright (c) 2012 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.
 
 #include "ash/wm/video_detector.h"
 
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 64 matching lines @@
   // Number of updates stored in |update_times_|.
   size_t buffer_size_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowInfo);
 };
 
 VideoDetector::VideoDetector()
     : state_(State::NOT_PLAYING),
       video_is_playing_(false),
       window_observer_manager_(this),
-      wm_window_observer_manager_(this),
       is_shutting_down_(false) {
   aura::Env::GetInstance()->AddObserver(this);
   WmShell::Get()->AddShellObserver(this);
 }
 
 VideoDetector::~VideoDetector() {
   WmShell::Get()->RemoveShellObserver(this);
   aura::Env::GetInstance()->RemoveObserver(this);
 }
 
@@ skipping 26 matching lines @@
   std::unique_ptr<WindowInfo>& info = window_infos_[window];
   if (!info.get())
     info.reset(new WindowInfo);
 
   base::TimeTicks now =
       !now_for_test_.is_null() ? now_for_test_ : base::TimeTicks::Now();
   if (info->RecordUpdateAndCheckForVideo(damage_rect_in_dip, now))
     HandleVideoActivity(window, now);
 }
 
+void VideoDetector::OnWindowDestroying(aura::Window* window) {
+  if (fullscreen_root_windows_.count(window)) {
+    window_observer_manager_.Remove(window);
+    fullscreen_root_windows_.erase(window);
+    UpdateState();
+  }
+}
+
 void VideoDetector::OnWindowDestroyed(aura::Window* window) {
   window_infos_.erase(window);
   window_observer_manager_.Remove(window);
 }
 
 void VideoDetector::OnAppTerminating() {
   // Stop checking video activity once the shutdown
   // process starts. crbug.com/231696.
   is_shutting_down_ = true;
 }
 
 void VideoDetector::OnFullscreenStateChanged(bool is_fullscreen,
                                              WmWindow* root_window) {
-  if (is_fullscreen && !fullscreen_root_windows_.count(root_window)) {
-    fullscreen_root_windows_.insert(root_window);
-    wm_window_observer_manager_.Add(root_window);
+  aura::Window* aura_window = root_window->aura_window();
+  if (is_fullscreen && !fullscreen_root_windows_.count(aura_window)) {
+    fullscreen_root_windows_.insert(aura_window);
+    if (!window_observer_manager_.IsObserving(aura_window))
+      window_observer_manager_.Add(aura_window);
     UpdateState();
-  } else if (!is_fullscreen && fullscreen_root_windows_.count(root_window)) {
-    fullscreen_root_windows_.erase(root_window);
-    wm_window_observer_manager_.Remove(root_window);
+  } else if (!is_fullscreen && fullscreen_root_windows_.count(aura_window)) {
+    fullscreen_root_windows_.erase(aura_window);
+    window_observer_manager_.Remove(aura_window);
     UpdateState();
   }
 }
-
-void VideoDetector::OnWindowDestroying(WmWindow* window) {
-  if (fullscreen_root_windows_.count(window)) {
-    wm_window_observer_manager_.Remove(window);
-    fullscreen_root_windows_.erase(window);
-    UpdateState();
-  }
-}
 
 void VideoDetector::HandleVideoActivity(aura::Window* window,
                                         base::TimeTicks now) {
   if (!window->IsVisible())
     return;
 
   gfx::Rect root_bounds = window->GetRootWindow()->bounds();
   if (!window->GetBoundsInRootWindow().Intersects(root_bounds))
     return;
 
@@ skipping 17 matching lines @@
   }
 
   if (state_ != new_state) {
     state_ = new_state;
     for (auto& observer : observers_)
       observer.OnVideoStateChanged(state_);
   }
 }
 
 }  // namespace ash