OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/common/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
6 | 6 |
7 #include "ash/common/wm/window_state.h" | |
8 #include "ash/common/wm_shell.h" | |
9 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/wm/window_state.h" |
10 #include "ash/wm/window_state_aura.h" | 9 #include "ash/wm/window_state_aura.h" |
| 10 #include "ash/wm_shell.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
14 #include "chrome/test/base/in_process_browser_test.h" | 14 #include "chrome/test/base/in_process_browser_test.h" |
15 #include "ui/events/test/event_generator.h" | 15 #include "ui/events/test/event_generator.h" |
16 | 16 |
17 #if defined(USE_X11) | 17 #if defined(USE_X11) |
18 #include "ui/events/test/events_test_utils_x11.h" | 18 #include "ui/events/test/events_test_utils_x11.h" |
19 #endif | 19 #endif |
20 | 20 |
(...skipping 23 matching lines...) Expand all Loading... |
44 ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow()); | 44 ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow()); |
45 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN); | 45 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN); |
46 EXPECT_TRUE(window_state->IsMaximized()); | 46 EXPECT_TRUE(window_state->IsMaximized()); |
47 | 47 |
48 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN); | 48 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN); |
49 | 49 |
50 generator.ReleaseKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN); | 50 generator.ReleaseKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN); |
51 EXPECT_TRUE(window_state->IsMaximized()); | 51 EXPECT_TRUE(window_state->IsMaximized()); |
52 } | 52 } |
53 #endif | 53 #endif |
OLD | NEW |