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/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "chrome/browser/chrome_browser_main.h" | 10 #include "chrome/browser/chrome_browser_main.h" |
11 #include "chrome/browser/ui/ash/ash_init.h" | 11 #include "chrome/browser/ui/ash/ash_init.h" |
12 #include "chrome/browser/ui/ash/ash_util.h" | 12 #include "chrome/browser/ui/ash/ash_util.h" |
13 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" | 13 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" |
14 #include "chrome/browser/ui/ash/chrome_new_window_client.h" | 14 #include "chrome/browser/ui/ash/chrome_new_window_client.h" |
| 15 #include "chrome/browser/ui/ash/chrome_shell_content_state.h" |
15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" | 16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" |
16 #include "chrome/browser/ui/ash/media_client.h" | 17 #include "chrome/browser/ui/ash/media_client.h" |
17 #include "chrome/browser/ui/ash/session_controller_client.h" | 18 #include "chrome/browser/ui/ash/session_controller_client.h" |
18 #include "chrome/browser/ui/ash/system_tray_client.h" | 19 #include "chrome/browser/ui/ash/system_tray_client.h" |
19 #include "chrome/browser/ui/ash/volume_controller.h" | 20 #include "chrome/browser/ui/ash/volume_controller.h" |
20 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" | 21 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" |
21 #include "chrome/browser/ui/views/ash/tab_scrubber.h" | 22 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
22 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" | 23 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" |
23 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" | 24 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" |
24 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" | 25 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); | 62 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); |
62 } | 63 } |
63 | 64 |
64 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { | 65 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
65 if (chrome::IsRunningInMash()) { | 66 if (chrome::IsRunningInMash()) { |
66 DCHECK(!ash::Shell::HasInstance()); | 67 DCHECK(!ash::Shell::HasInstance()); |
67 DCHECK(!ChromeLauncherController::instance()); | 68 DCHECK(!ChromeLauncherController::instance()); |
68 chrome_launcher_controller_mus_ = | 69 chrome_launcher_controller_mus_ = |
69 base::MakeUnique<ChromeLauncherControllerMus>(); | 70 base::MakeUnique<ChromeLauncherControllerMus>(); |
70 chrome_launcher_controller_mus_->Init(); | 71 chrome_launcher_controller_mus_->Init(); |
| 72 chrome_shell_content_state_ = base::MakeUnique<ChromeShellContentState>(); |
71 } | 73 } |
72 | 74 |
73 cast_config_client_media_router_ = | 75 cast_config_client_media_router_ = |
74 base::MakeUnique<CastConfigClientMediaRouter>(); | 76 base::MakeUnique<CastConfigClientMediaRouter>(); |
75 media_client_ = base::MakeUnique<MediaClient>(); | 77 media_client_ = base::MakeUnique<MediaClient>(); |
76 | 78 |
77 if (!ash::Shell::HasInstance()) | 79 if (!ash::Shell::HasInstance()) |
78 return; | 80 return; |
79 | 81 |
80 // Initialize TabScrubber after the Ash Shell has been initialized. | 82 // Initialize TabScrubber after the Ash Shell has been initialized. |
81 TabScrubber::GetInstance(); | 83 TabScrubber::GetInstance(); |
82 // Activate virtual keyboard after profile is initialized. It depends on the | 84 // Activate virtual keyboard after profile is initialized. It depends on the |
83 // default profile. | 85 // default profile. |
84 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( | 86 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
85 keyboard::KeyboardController::GetInstance()); | 87 keyboard::KeyboardController::GetInstance()); |
86 } | 88 } |
87 | 89 |
88 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 90 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
89 vpn_list_forwarder_.reset(); | 91 vpn_list_forwarder_.reset(); |
90 volume_controller_.reset(); | 92 volume_controller_.reset(); |
91 new_window_client_.reset(); | 93 new_window_client_.reset(); |
92 system_tray_client_.reset(); | 94 system_tray_client_.reset(); |
93 media_client_.reset(); | 95 media_client_.reset(); |
94 cast_config_client_media_router_.reset(); | 96 cast_config_client_media_router_.reset(); |
95 session_controller_client_.reset(); | 97 session_controller_client_.reset(); |
96 | 98 |
97 chrome::CloseAsh(); | 99 chrome::CloseAsh(); |
98 } | 100 } |
OLD | NEW |