Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Side by Side Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 2578893003: Converts chrome to aura-mus (Closed)
Patch Set: merge again Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/cast_config_client_media_router.h" 17 #include "chrome/browser/ui/ash/cast_config_client_media_router.h"
18 #include "chrome/browser/ui/ash/chrome_new_window_client.h" 18 #include "chrome/browser/ui/ash/chrome_new_window_client.h"
19 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" 19 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
20 #include "chrome/browser/ui/ash/media_client.h" 20 #include "chrome/browser/ui/ash/media_client.h"
21 #include "chrome/browser/ui/views/ash/tab_scrubber.h" 21 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
22 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
22 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" 23 #include "chrome/browser/ui/views/frame/immersive_context_mus.h"
23 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" 24 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h"
24 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
25 #include "ui/aura/env.h" 26 #include "ui/aura/env.h"
26 #include "ui/keyboard/content/keyboard.h" 27 #include "ui/keyboard/content/keyboard.h"
27 #include "ui/keyboard/keyboard_controller.h" 28 #include "ui/keyboard/keyboard_controller.h"
29 #include "ui/wm/core/capture_controller.h"
30 #include "ui/wm/core/wm_state.h"
28 31
29 #if defined(OS_CHROMEOS) 32 #if defined(OS_CHROMEOS)
30 #include "chrome/browser/ui/ash/session_controller_client.h" 33 #include "chrome/browser/ui/ash/session_controller_client.h"
31 #include "chrome/browser/ui/ash/system_tray_client.h" 34 #include "chrome/browser/ui/ash/system_tray_client.h"
32 #include "chrome/browser/ui/ash/volume_controller.h" 35 #include "chrome/browser/ui/ash/volume_controller.h"
33 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" 36 #include "chrome/browser/ui/ash/vpn_list_forwarder.h"
34 #include "chrome/browser/ui/views/select_file_dialog_extension.h" 37 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
35 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" 38 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
36 #endif // defined(OS_CHROMEOS) 39 #endif // defined(OS_CHROMEOS)
37 40
38 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {} 41 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh(
42 ChromeBrowserMainExtraPartsViews* extra_parts_views)
43 : extra_parts_views_(extra_parts_views) {}
39 44
40 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {} 45 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {}
41 46
42 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { 47 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
43 if (chrome::ShouldOpenAshOnStartup()) 48 if (chrome::ShouldOpenAshOnStartup())
44 chrome::OpenAsh(gfx::kNullAcceleratedWidget); 49 chrome::OpenAsh(gfx::kNullAcceleratedWidget);
45 50
46 if (chrome::IsRunningInMash()) { 51 if (chrome::IsRunningInMash()) {
47 immersive_context_ = base::MakeUnique<ImmersiveContextMus>(); 52 immersive_context_ = base::MakeUnique<ImmersiveContextMus>(
53 extra_parts_views_->wm_state()->capture_controller());
48 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>(); 54 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
49 } 55 }
50 56
51 #if defined(OS_CHROMEOS) 57 #if defined(OS_CHROMEOS)
52 // TODO(xiyuan): Update after SesssionStateDelegate is deprecated. 58 // TODO(xiyuan): Update after SesssionStateDelegate is deprecated.
53 if (chrome::IsRunningInMash()) 59 if (chrome::IsRunningInMash())
54 session_controller_client_ = base::MakeUnique<SessionControllerClient>(); 60 session_controller_client_ = base::MakeUnique<SessionControllerClient>();
55 61
56 // Must be available at login screen, so initialize before profile. 62 // Must be available at login screen, so initialize before profile.
57 system_tray_client_ = base::MakeUnique<SystemTrayClient>(); 63 system_tray_client_ = base::MakeUnique<SystemTrayClient>();
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 vpn_list_forwarder_.reset(); 103 vpn_list_forwarder_.reset();
98 volume_controller_.reset(); 104 volume_controller_.reset();
99 new_window_client_.reset(); 105 new_window_client_.reset();
100 system_tray_client_.reset(); 106 system_tray_client_.reset();
101 media_client_.reset(); 107 media_client_.reset();
102 cast_config_client_media_router_.reset(); 108 cast_config_client_media_router_.reset();
103 session_controller_client_.reset(); 109 session_controller_client_.reset();
104 #endif 110 #endif
105 chrome::CloseAsh(); 111 chrome::CloseAsh();
106 } 112 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698