OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/virtual_keyboard_window_controller.h" | 5 #include "ash/display/virtual_keyboard_window_controller.h" |
6 | 6 |
7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
8 #include "ash/display/display_info.h" | 8 #include "ash/display/display_info.h" |
9 #include "ash/display/display_manager.h" | 9 #include "ash/display/display_manager.h" |
10 #include "ash/display/root_window_transformers.h" | 10 #include "ash/display/root_window_transformers.h" |
11 #include "ash/host/window_tree_host_factory.h" | 11 #include "ash/host/window_tree_host_factory.h" |
12 #include "ash/root_window_controller.h" | 12 #include "ash/root_window_controller.h" |
13 #include "ash/root_window_settings.h" | 13 #include "ash/root_window_settings.h" |
14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
15 #include "ash/shell_window_ids.h" | 15 #include "ash/shell_window_ids.h" |
16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
18 #include "ui/aura/env.h" | 18 #include "ui/aura/env.h" |
19 #include "ui/aura/root_window.h" | |
20 #include "ui/aura/root_window_transformer.h" | 19 #include "ui/aura/root_window_transformer.h" |
| 20 #include "ui/aura/window_event_dispatcher.h" |
21 #include "ui/keyboard/keyboard_controller.h" | 21 #include "ui/keyboard/keyboard_controller.h" |
22 | 22 |
23 namespace ash { | 23 namespace ash { |
24 namespace internal { | 24 namespace internal { |
25 | 25 |
26 VirtualKeyboardWindowController::VirtualKeyboardWindowController() { | 26 VirtualKeyboardWindowController::VirtualKeyboardWindowController() { |
27 } | 27 } |
28 | 28 |
29 VirtualKeyboardWindowController::~VirtualKeyboardWindowController() { | 29 VirtualKeyboardWindowController::~VirtualKeyboardWindowController() { |
30 // Make sure the root window gets deleted before cursor_window_delegate. | 30 // Make sure the root window gets deleted before cursor_window_delegate. |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 aura::WindowEventDispatcher* dispatcher = | 96 aura::WindowEventDispatcher* dispatcher = |
97 root_window_controller_->dispatcher(); | 97 root_window_controller_->dispatcher(); |
98 scoped_ptr<aura::RootWindowTransformer> transformer( | 98 scoped_ptr<aura::RootWindowTransformer> transformer( |
99 internal::CreateRootWindowTransformerForDisplay(dispatcher->window(), | 99 internal::CreateRootWindowTransformerForDisplay(dispatcher->window(), |
100 display_manager->non_desktop_display())); | 100 display_manager->non_desktop_display())); |
101 dispatcher->host()->SetRootWindowTransformer(transformer.Pass()); | 101 dispatcher->host()->SetRootWindowTransformer(transformer.Pass()); |
102 } | 102 } |
103 | 103 |
104 } // namespace internal | 104 } // namespace internal |
105 } // namespace ash | 105 } // namespace ash |
OLD | NEW |