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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 base::TimeTicks now) { | 93 base::TimeTicks now) { |
94 if (!last_observer_notification_time_.is_null() && | 94 if (!last_observer_notification_time_.is_null() && |
95 (now - last_observer_notification_time_).InSecondsF() < | 95 (now - last_observer_notification_time_).InSecondsF() < |
96 kNotifyIntervalSec) | 96 kNotifyIntervalSec) |
97 return; | 97 return; |
98 | 98 |
99 if (!window->IsVisible()) | 99 if (!window->IsVisible()) |
100 return; | 100 return; |
101 | 101 |
102 gfx::Rect root_bounds = window->GetRootWindow()->bounds(); | 102 gfx::Rect root_bounds = window->GetRootWindow()->bounds(); |
103 if (!window->GetRootWindowBounds().Intersects(root_bounds)) | 103 if (!window->GetBoundsInRootWindow().Intersects(root_bounds)) |
104 return; | 104 return; |
105 | 105 |
106 FOR_EACH_OBSERVER(VideoDetectorObserver, observers_, OnVideoDetected()); | 106 FOR_EACH_OBSERVER(VideoDetectorObserver, observers_, OnVideoDetected()); |
107 last_observer_notification_time_ = now; | 107 last_observer_notification_time_ = now; |
108 } | 108 } |
109 | 109 |
110 } // namespace ash | 110 } // namespace ash |
OLD | NEW |