| 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 "ui/aura/env.h" | 8 #include "ui/aura/env.h" |
| 9 #include "ui/aura/root_window.h" | 9 #include "ui/aura/root_window.h" |
| 10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 base::TimeTicks now) { | 96 base::TimeTicks now) { |
| 97 if (!last_observer_notification_time_.is_null() && | 97 if (!last_observer_notification_time_.is_null() && |
| 98 (now - last_observer_notification_time_).InSecondsF() < | 98 (now - last_observer_notification_time_).InSecondsF() < |
| 99 kNotifyIntervalSec) | 99 kNotifyIntervalSec) |
| 100 return; | 100 return; |
| 101 | 101 |
| 102 if (!window->IsVisible()) | 102 if (!window->IsVisible()) |
| 103 return; | 103 return; |
| 104 | 104 |
| 105 gfx::Rect root_bounds = Shell::GetRootWindow()->bounds(); | 105 gfx::Rect root_bounds = Shell::GetRootWindow()->bounds(); |
| 106 if (!window->GetScreenBounds().Intersects(root_bounds)) | 106 if (!window->GetBoundsInRootWindow().Intersects(root_bounds)) |
| 107 return; | 107 return; |
| 108 | 108 |
| 109 FOR_EACH_OBSERVER(VideoDetectorObserver, observers_, OnVideoDetected()); | 109 FOR_EACH_OBSERVER(VideoDetectorObserver, observers_, OnVideoDetected()); |
| 110 last_observer_notification_time_ = now; | 110 last_observer_notification_time_ = now; |
| 111 } | 111 } |
| 112 | 112 |
| 113 } // namespace ash | 113 } // namespace ash |
| OLD | NEW |