| 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_state_delegate.h" | 8 #include "ash/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_util.h" | 21 #include "ui/keyboard/keyboard_util.h" |
| 22 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 22 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
| 23 | 23 |
| 24 #if defined(FILE_MANAGER_EXTENSION) | 24 #if defined(OS_CHROMEOS) |
| 25 #include "chrome/browser/ui/views/select_file_dialog_extension.h" | 25 #include "chrome/browser/ui/views/select_file_dialog_extension.h" |
| 26 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" | 26 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 #if !defined(OS_CHROMEOS) | 29 #if !defined(OS_CHROMEOS) |
| 30 #include "ui/shell_dialogs/select_file_dialog.h" | 30 #include "ui/shell_dialogs/select_file_dialog.h" |
| 31 #include "ui/shell_dialogs/shell_dialogs_delegate.h" | 31 #include "ui/shell_dialogs/shell_dialogs_delegate.h" |
| 32 #endif | 32 #endif |
| 33 | 33 |
| 34 #if !defined(OS_CHROMEOS) | 34 #if !defined(OS_CHROMEOS) |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 #endif | 76 #endif |
| 77 } | 77 } |
| 78 #if defined(OS_CHROMEOS) | 78 #if defined(OS_CHROMEOS) |
| 79 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile | 79 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile |
| 80 // initialized. Otherwise, virtual keyboard extension will not load at login | 80 // initialized. Otherwise, virtual keyboard extension will not load at login |
| 81 // screen. | 81 // screen. |
| 82 if (keyboard::IsKeyboardEnabled()) | 82 if (keyboard::IsKeyboardEnabled()) |
| 83 keyboard::InitializeKeyboard(); | 83 keyboard::InitializeKeyboard(); |
| 84 #endif | 84 #endif |
| 85 | 85 |
| 86 #if defined(FILE_MANAGER_EXTENSION) | 86 #if defined(OS_CHROMEOS) |
| 87 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); | 87 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); |
| 88 #endif | 88 #endif |
| 89 } | 89 } |
| 90 | 90 |
| 91 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { | 91 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
| 92 if (!ash::Shell::HasInstance()) | 92 if (!ash::Shell::HasInstance()) |
| 93 return; | 93 return; |
| 94 | 94 |
| 95 // Initialize TabScrubber after the Ash Shell has been initialized. | 95 // Initialize TabScrubber after the Ash Shell has been initialized. |
| 96 TabScrubber::GetInstance(); | 96 TabScrubber::GetInstance(); |
| 97 // Activate virtual keyboard after profile is initialized. It depends on the | 97 // Activate virtual keyboard after profile is initialized. It depends on the |
| 98 // default profile. If keyboard usability experiment flag is set, defer the | 98 // default profile. If keyboard usability experiment flag is set, defer the |
| 99 // activation to UpdateWindow() in virtual_keyboard_window_controller.cc. | 99 // activation to UpdateWindow() in virtual_keyboard_window_controller.cc. |
| 100 if (!keyboard::IsKeyboardUsabilityExperimentEnabled()) { | 100 if (!keyboard::IsKeyboardUsabilityExperimentEnabled()) { |
| 101 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( | 101 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
| 102 ash::Shell::GetInstance()->keyboard_controller()); | 102 ash::Shell::GetInstance()->keyboard_controller()); |
| 103 } | 103 } |
| 104 } | 104 } |
| 105 | 105 |
| 106 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 106 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
| 107 chrome::CloseAsh(); | 107 chrome::CloseAsh(); |
| 108 } | 108 } |
| OLD | NEW |