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 "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" | 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" |
6 | 6 |
7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
8 #include "ash/session/session_state_delegate.h" | 8 #include "ash/session/session_state_delegate.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
12 #include "chrome/browser/chrome_browser_main.h" | 12 #include "chrome/browser/chrome_browser_main.h" |
13 #include "chrome/browser/ui/ash/ash_init.h" | 13 #include "chrome/browser/ui/ash/ash_init.h" |
14 #include "chrome/browser/ui/ash/ash_util.h" | 14 #include "chrome/browser/ui/ash/ash_util.h" |
15 #include "chrome/browser/ui/views/ash/tab_scrubber.h" | 15 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
16 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
17 #include "ui/aura/env.h" | 17 #include "ui/aura/env.h" |
18 #include "ui/gfx/screen.h" | 18 #include "ui/gfx/screen.h" |
19 #include "ui/gfx/screen_type_delegate.h" | 19 #include "ui/gfx/screen_type_delegate.h" |
20 #include "ui/keyboard/keyboard.h" | 20 #include "ui/keyboard/keyboard.h" |
21 #include "ui/keyboard/keyboard_controller.h" | 21 #include "ui/keyboard/keyboard_controller.h" |
22 #include "ui/keyboard/keyboard_util.h" | |
23 | 22 |
24 #if defined(OS_CHROMEOS) | 23 #if defined(OS_CHROMEOS) |
25 #include "chrome/browser/ui/views/select_file_dialog_extension.h" | 24 #include "chrome/browser/ui/views/select_file_dialog_extension.h" |
26 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" | 25 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
27 #endif | 26 #endif |
28 | 27 |
29 #if !defined(OS_CHROMEOS) | 28 #if !defined(OS_CHROMEOS) |
30 #include "ui/shell_dialogs/select_file_dialog.h" | 29 #include "ui/shell_dialogs/select_file_dialog.h" |
31 #include "ui/shell_dialogs/shell_dialogs_delegate.h" | 30 #include "ui/shell_dialogs/shell_dialogs_delegate.h" |
32 #endif | 31 #endif |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 #endif | 99 #endif |
101 } | 100 } |
102 | 101 |
103 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { | 102 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
104 if (!ash::Shell::HasInstance()) | 103 if (!ash::Shell::HasInstance()) |
105 return; | 104 return; |
106 | 105 |
107 // Initialize TabScrubber after the Ash Shell has been initialized. | 106 // Initialize TabScrubber after the Ash Shell has been initialized. |
108 TabScrubber::GetInstance(); | 107 TabScrubber::GetInstance(); |
109 // Activate virtual keyboard after profile is initialized. It depends on the | 108 // Activate virtual keyboard after profile is initialized. It depends on the |
110 // default profile. If keyboard usability experiment flag is set, defer the | 109 // default profile. |
111 // activation to UpdateWindow() in virtual_keyboard_window_controller.cc. | 110 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
112 if (!keyboard::IsKeyboardUsabilityExperimentEnabled()) { | 111 keyboard::KeyboardController::GetInstance()); |
113 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( | |
114 keyboard::KeyboardController::GetInstance()); | |
115 } | |
116 } | 112 } |
117 | 113 |
118 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 114 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
119 chrome::CloseAsh(); | 115 chrome::CloseAsh(); |
120 } | 116 } |
OLD | NEW |