| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/video_detector.h" | 5 #include "ash/wm/video_detector.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/wm/window_state.h" |
| 8 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
| 9 #include "ui/aura/env.h" | 10 #include "ui/aura/env.h" |
| 10 #include "ui/aura/root_window.h" | 11 #include "ui/aura/root_window.h" |
| 11 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 12 #include "ui/gfx/rect.h" | 13 #include "ui/gfx/rect.h" |
| 13 | 14 |
| 14 namespace ash { | 15 namespace ash { |
| 15 | 16 |
| 16 const int VideoDetector::kMinUpdateWidth = 333; | 17 const int VideoDetector::kMinUpdateWidth = 333; |
| 17 const int VideoDetector::kMinUpdateHeight = 250; | 18 const int VideoDetector::kMinUpdateHeight = 250; |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 return; | 116 return; |
| 116 | 117 |
| 117 if (!window->IsVisible()) | 118 if (!window->IsVisible()) |
| 118 return; | 119 return; |
| 119 | 120 |
| 120 gfx::Rect root_bounds = window->GetRootWindow()->bounds(); | 121 gfx::Rect root_bounds = window->GetRootWindow()->bounds(); |
| 121 if (!window->GetBoundsInRootWindow().Intersects(root_bounds)) | 122 if (!window->GetBoundsInRootWindow().Intersects(root_bounds)) |
| 122 return; | 123 return; |
| 123 | 124 |
| 124 aura::Window* toplevel_window = wm::GetActivatableWindow(window); | 125 aura::Window* toplevel_window = wm::GetActivatableWindow(window); |
| 125 bool is_fullscreen = | 126 bool is_fullscreen = toplevel_window ? |
| 126 toplevel_window ? wm::IsWindowFullscreen(toplevel_window) : false; | 127 wm::GetWindowState(toplevel_window)->IsFullscreen() : false; |
| 127 | 128 |
| 128 FOR_EACH_OBSERVER(VideoDetectorObserver, | 129 FOR_EACH_OBSERVER(VideoDetectorObserver, |
| 129 observers_, | 130 observers_, |
| 130 OnVideoDetected(is_fullscreen)); | 131 OnVideoDetected(is_fullscreen)); |
| 131 last_observer_notification_time_ = now; | 132 last_observer_notification_time_ = now; |
| 132 } | 133 } |
| 133 | 134 |
| 134 } // namespace ash | 135 } // namespace ash |
| OLD | NEW |