| 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 <deque> | 7 #include <deque> |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/common/wm/window_state.h" | |
| 11 #include "ash/common/wm/wm_event.h" | |
| 12 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 13 #include "ash/test/ash_test_base.h" | 11 #include "ash/test/ash_test_base.h" |
| 12 #include "ash/wm/window_state.h" |
| 14 #include "ash/wm/window_state_aura.h" | 13 #include "ash/wm/window_state_aura.h" |
| 14 #include "ash/wm/wm_event.h" |
| 15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 16 #include "base/time/time.h" | 16 #include "base/time/time.h" |
| 17 #include "third_party/skia/include/core/SkColor.h" | 17 #include "third_party/skia/include/core/SkColor.h" |
| 18 #include "ui/aura/client/aura_constants.h" | 18 #include "ui/aura/client/aura_constants.h" |
| 19 #include "ui/aura/test/test_windows.h" | 19 #include "ui/aura/test/test_windows.h" |
| 20 #include "ui/aura/window.h" | 20 #include "ui/aura/window.h" |
| 21 #include "ui/aura/window_event_dispatcher.h" | 21 #include "ui/aura/window_event_dispatcher.h" |
| 22 #include "ui/gfx/geometry/rect.h" | 22 #include "ui/gfx/geometry/rect.h" |
| 23 #include "ui/wm/public/window_types.h" | 23 #include "ui/wm/public/window_types.h" |
| 24 | 24 |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 // immediately notified about windowed video. | 289 // immediately notified about windowed video. |
| 290 observer_->reset(); | 290 observer_->reset(); |
| 291 other_window_state->OnWMEvent(&toggle_fullscreen_event); | 291 other_window_state->OnWMEvent(&toggle_fullscreen_event); |
| 292 ASSERT_FALSE(other_window_state->IsFullscreen()); | 292 ASSERT_FALSE(other_window_state->IsFullscreen()); |
| 293 EXPECT_EQ(VideoDetector::State::PLAYING_WINDOWED, observer_->PopState()); | 293 EXPECT_EQ(VideoDetector::State::PLAYING_WINDOWED, observer_->PopState()); |
| 294 EXPECT_TRUE(observer_->empty()); | 294 EXPECT_TRUE(observer_->empty()); |
| 295 } | 295 } |
| 296 | 296 |
| 297 } // namespace test | 297 } // namespace test |
| 298 } // namespace ash | 298 } // namespace ash |
| OLD | NEW |