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/display/display_controller.h" | 5 #include "ash/display/display_controller.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/display/display_info.h" | 8 #include "ash/display/display_info.h" |
9 #include "ash/display/display_layout_store.h" | 9 #include "ash/display/display_layout_store.h" |
10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
11 #include "ash/screen_util.h" | 11 #include "ash/screen_util.h" |
12 #include "ash/shelf/shelf.h" | 12 #include "ash/shelf/shelf.h" |
13 #include "ash/shelf/shelf_widget.h" | 13 #include "ash/shelf/shelf_widget.h" |
14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
15 #include "ash/test/ash_test_base.h" | 15 #include "ash/test/ash_test_base.h" |
16 #include "ash/test/cursor_manager_test_api.h" | 16 #include "ash/test/cursor_manager_test_api.h" |
17 #include "ash/test/display_manager_test_api.h" | 17 #include "ash/test/display_manager_test_api.h" |
18 #include "ash/wm/window_state.h" | 18 #include "ash/wm/window_state.h" |
19 #include "base/command_line.h" | 19 #include "base/command_line.h" |
20 #include "ui/aura/client/activation_change_observer.h" | 20 #include "ui/aura/client/activation_change_observer.h" |
21 #include "ui/aura/client/activation_client.h" | 21 #include "ui/aura/client/activation_client.h" |
22 #include "ui/aura/client/focus_change_observer.h" | 22 #include "ui/aura/client/focus_change_observer.h" |
23 #include "ui/aura/client/focus_client.h" | 23 #include "ui/aura/client/focus_client.h" |
24 #include "ui/aura/env.h" | 24 #include "ui/aura/env.h" |
25 #include "ui/aura/root_window.h" | |
26 #include "ui/aura/test/event_generator.h" | 25 #include "ui/aura/test/event_generator.h" |
| 26 #include "ui/aura/window_event_dispatcher.h" |
27 #include "ui/aura/window_tracker.h" | 27 #include "ui/aura/window_tracker.h" |
28 #include "ui/events/event_handler.h" | 28 #include "ui/events/event_handler.h" |
29 #include "ui/gfx/display.h" | 29 #include "ui/gfx/display.h" |
30 #include "ui/gfx/screen.h" | 30 #include "ui/gfx/screen.h" |
31 #include "ui/views/widget/widget.h" | 31 #include "ui/views/widget/widget.h" |
32 | 32 |
33 #if defined(USE_X11) | 33 #if defined(USE_X11) |
34 #include <X11/Xlib.h> | 34 #include <X11/Xlib.h> |
35 #include "ui/gfx/x/x11_types.h" | 35 #include "ui/gfx/x/x11_types.h" |
36 #undef RootWindow | 36 #undef RootWindow |
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1328 EXPECT_EQ("aura_root_x", GetXWindowName(secondary->GetDispatcher()->host())); | 1328 EXPECT_EQ("aura_root_x", GetXWindowName(secondary->GetDispatcher()->host())); |
1329 | 1329 |
1330 // Switching back to single display. | 1330 // Switching back to single display. |
1331 UpdateDisplay("300x400"); | 1331 UpdateDisplay("300x400"); |
1332 EXPECT_EQ("aura_root_0", GetXWindowName( | 1332 EXPECT_EQ("aura_root_0", GetXWindowName( |
1333 Shell::GetPrimaryRootWindow()->GetDispatcher()->host())); | 1333 Shell::GetPrimaryRootWindow()->GetDispatcher()->host())); |
1334 } | 1334 } |
1335 #endif | 1335 #endif |
1336 | 1336 |
1337 } // namespace ash | 1337 } // namespace ash |
OLD | NEW |