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/shell.h" | 5 #include "ash/shell.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/common/session/session_state_delegate.h" | |
11 #include "ash/common/shelf/shelf_layout_manager.h" | |
12 #include "ash/common/shelf/shelf_widget.h" | |
13 #include "ash/common/shelf/wm_shelf.h" | |
14 #include "ash/common/wallpaper/wallpaper_widget_controller.h" | |
15 #include "ash/common/wm_shell.h" | |
16 #include "ash/common/wm_window.h" | |
17 #include "ash/display/mouse_cursor_event_filter.h" | 10 #include "ash/display/mouse_cursor_event_filter.h" |
18 #include "ash/drag_drop/drag_drop_controller.h" | 11 #include "ash/drag_drop/drag_drop_controller.h" |
19 #include "ash/public/cpp/shell_window_ids.h" | 12 #include "ash/public/cpp/shell_window_ids.h" |
20 #include "ash/root_window_controller.h" | 13 #include "ash/root_window_controller.h" |
| 14 #include "ash/session/session_state_delegate.h" |
| 15 #include "ash/shelf/shelf_layout_manager.h" |
| 16 #include "ash/shelf/shelf_widget.h" |
| 17 #include "ash/shelf/wm_shelf.h" |
21 #include "ash/test/ash_test_base.h" | 18 #include "ash/test/ash_test_base.h" |
22 #include "ash/test/shell_test_api.h" | 19 #include "ash/test/shell_test_api.h" |
| 20 #include "ash/wallpaper/wallpaper_widget_controller.h" |
23 #include "ash/wm/window_util.h" | 21 #include "ash/wm/window_util.h" |
| 22 #include "ash/wm_shell.h" |
| 23 #include "ash/wm_window.h" |
24 #include "base/strings/utf_string_conversions.h" | 24 #include "base/strings/utf_string_conversions.h" |
25 #include "base/threading/thread_task_runner_handle.h" | 25 #include "base/threading/thread_task_runner_handle.h" |
26 #include "ui/aura/client/aura_constants.h" | 26 #include "ui/aura/client/aura_constants.h" |
27 #include "ui/aura/env.h" | 27 #include "ui/aura/env.h" |
28 #include "ui/aura/window.h" | 28 #include "ui/aura/window.h" |
29 #include "ui/aura/window_event_dispatcher.h" | 29 #include "ui/aura/window_event_dispatcher.h" |
30 #include "ui/base/models/simple_menu_model.h" | 30 #include "ui/base/models/simple_menu_model.h" |
31 #include "ui/events/test/event_generator.h" | 31 #include "ui/events/test/event_generator.h" |
32 #include "ui/events/test/events_test_utils.h" | 32 #include "ui/events/test/events_test_utils.h" |
33 #include "ui/events/test/test_event_handler.h" | 33 #include "ui/events/test/test_event_handler.h" |
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 // the case with classic-ash where embedders can separately create | 512 // the case with classic-ash where embedders can separately create |
513 // aura::Windows. | 513 // aura::Windows. |
514 if (WmShell::Get()->IsRunningInMash()) | 514 if (WmShell::Get()->IsRunningInMash()) |
515 return; | 515 return; |
516 | 516 |
517 window_.reset(new aura::Window(NULL)); | 517 window_.reset(new aura::Window(NULL)); |
518 window_->Init(ui::LAYER_NOT_DRAWN); | 518 window_->Init(ui::LAYER_NOT_DRAWN); |
519 } | 519 } |
520 | 520 |
521 } // namespace ash | 521 } // namespace ash |
OLD | NEW |