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/shell.h" | 8 #include "ash/shell.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
14 #include "chrome/browser/chrome_browser_main.h" | 14 #include "chrome/browser/chrome_browser_main.h" |
15 #include "chrome/browser/ui/ash/ash_init.h" | 15 #include "chrome/browser/ui/ash/ash_init.h" |
16 #include "chrome/browser/ui/ash/ash_util.h" | 16 #include "chrome/browser/ui/ash/ash_util.h" |
17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" | 17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" |
18 #include "chrome/browser/ui/views/ash/tab_scrubber.h" | 18 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
19 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" | 19 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" |
20 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" | 20 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" |
21 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
22 #include "ui/aura/env.h" | 22 #include "ui/aura/env.h" |
23 #include "ui/keyboard/content/keyboard.h" | 23 #include "ui/keyboard/content/keyboard.h" |
24 #include "ui/keyboard/keyboard_controller.h" | 24 #include "ui/keyboard/keyboard_controller.h" |
25 | 25 |
26 #if defined(OS_CHROMEOS) | 26 #if defined(OS_CHROMEOS) |
27 #include "chrome/browser/ui/ash/session_controller_client.h" | |
27 #include "chrome/browser/ui/ash/system_tray_client.h" | 28 #include "chrome/browser/ui/ash/system_tray_client.h" |
28 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" | 29 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" |
29 #include "chrome/browser/ui/views/select_file_dialog_extension.h" | 30 #include "chrome/browser/ui/views/select_file_dialog_extension.h" |
30 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" | 31 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
31 #endif // defined(OS_CHROMEOS) | 32 #endif // defined(OS_CHROMEOS) |
32 | 33 |
33 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {} | 34 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {} |
34 | 35 |
35 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {} | 36 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {} |
36 | 37 |
37 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { | 38 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { |
38 if (chrome::ShouldOpenAshOnStartup()) | 39 if (chrome::ShouldOpenAshOnStartup()) |
39 chrome::OpenAsh(gfx::kNullAcceleratedWidget); | 40 chrome::OpenAsh(gfx::kNullAcceleratedWidget); |
40 | 41 |
41 if (chrome::IsRunningInMash()) { | 42 if (chrome::IsRunningInMash()) { |
42 immersive_context_ = base::MakeUnique<ImmersiveContextMus>(); | 43 immersive_context_ = base::MakeUnique<ImmersiveContextMus>(); |
43 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>(); | 44 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>(); |
44 } | 45 } |
45 | 46 |
46 #if defined(OS_CHROMEOS) | 47 #if defined(OS_CHROMEOS) |
47 // Must be available at login screen, so initialize before profile. | 48 // Must be available at login screen, so initialize before profile. |
48 system_tray_client_ = base::MakeUnique<SystemTrayClient>(); | 49 system_tray_client_ = base::MakeUnique<SystemTrayClient>(); |
50 session_controller_client_ = base::MakeUnique<SessionControllerClient>(); | |
James Cook
2016/12/01 23:01:44
Do you want to create this only when IsRunningInMa
xiyuan
2016/12/06 00:46:34
Put this under IsRunningInMash() since it is not u
| |
49 | 51 |
50 vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>(); | 52 vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>(); |
51 | 53 |
52 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile | 54 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile |
53 // initialized. Otherwise, virtual keyboard extension will not load at login | 55 // initialized. Otherwise, virtual keyboard extension will not load at login |
54 // screen. | 56 // screen. |
55 keyboard::InitializeKeyboard(); | 57 keyboard::InitializeKeyboard(); |
56 | 58 |
57 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); | 59 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); |
58 #endif // defined(OS_CHROMEOS) | 60 #endif // defined(OS_CHROMEOS) |
(...skipping 16 matching lines...) Expand all Loading... | |
75 // Activate virtual keyboard after profile is initialized. It depends on the | 77 // Activate virtual keyboard after profile is initialized. It depends on the |
76 // default profile. | 78 // default profile. |
77 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( | 79 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
78 keyboard::KeyboardController::GetInstance()); | 80 keyboard::KeyboardController::GetInstance()); |
79 } | 81 } |
80 | 82 |
81 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 83 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
82 #if defined(OS_CHROMEOS) | 84 #if defined(OS_CHROMEOS) |
83 vpn_list_forwarder_.reset(); | 85 vpn_list_forwarder_.reset(); |
84 system_tray_client_.reset(); | 86 system_tray_client_.reset(); |
87 session_controller_client_.reset(); | |
James Cook
2016/12/01 23:01:44
nit: either initialize before system_tray_client o
xiyuan
2016/12/06 00:46:34
Done.
| |
85 #endif | 88 #endif |
86 chrome::CloseAsh(); | 89 chrome::CloseAsh(); |
87 } | 90 } |
OLD | NEW |