Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
index ddb0dba0c79dc98ce97a8cbb3126d9d499908912..b015a0530e8a33db14487e3161136dcbfa9eb4bc 100644 |
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
@@ -6,11 +6,7 @@ |
#include "ash/root_window_controller.h" |
#include "ash/shell.h" |
-#include "base/command_line.h" |
-#include "base/lazy_instance.h" |
-#include "base/macros.h" |
#include "base/memory/ptr_util.h" |
-#include "build/build_config.h" |
#include "chrome/browser/chrome_browser_main.h" |
#include "chrome/browser/ui/ash/ash_init.h" |
#include "chrome/browser/ui/ash/ash_util.h" |
@@ -19,26 +15,21 @@ |
#include "chrome/browser/ui/ash/chrome_shell_content_state.h" |
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" |
#include "chrome/browser/ui/ash/media_client.h" |
+#include "chrome/browser/ui/ash/session_controller_client.h" |
+#include "chrome/browser/ui/ash/system_tray_client.h" |
+#include "chrome/browser/ui/ash/volume_controller.h" |
+#include "chrome/browser/ui/ash/vpn_list_forwarder.h" |
#include "chrome/browser/ui/views/ash/tab_scrubber.h" |
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" |
#include "chrome/browser/ui/views/frame/immersive_context_mus.h" |
#include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" |
-#include "chrome/common/chrome_switches.h" |
-#include "ui/aura/env.h" |
+#include "chrome/browser/ui/views/select_file_dialog_extension.h" |
+#include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
#include "ui/keyboard/content/keyboard.h" |
#include "ui/keyboard/keyboard_controller.h" |
#include "ui/wm/core/capture_controller.h" |
#include "ui/wm/core/wm_state.h" |
-#if defined(OS_CHROMEOS) |
-#include "chrome/browser/ui/ash/session_controller_client.h" |
-#include "chrome/browser/ui/ash/system_tray_client.h" |
-#include "chrome/browser/ui/ash/volume_controller.h" |
-#include "chrome/browser/ui/ash/vpn_list_forwarder.h" |
-#include "chrome/browser/ui/views/select_file_dialog_extension.h" |
-#include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
-#endif // defined(OS_CHROMEOS) |
- |
ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh( |
ChromeBrowserMainExtraPartsViews* extra_parts_views) |
: extra_parts_views_(extra_parts_views) {} |
@@ -55,10 +46,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { |
immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>(); |
} |
-#if defined(OS_CHROMEOS) |
- // TODO(xiyuan): Update after SesssionStateDelegate is deprecated. |
- if (chrome::IsRunningInMash()) |
- session_controller_client_ = base::MakeUnique<SessionControllerClient>(); |
+ session_controller_client_ = base::MakeUnique<SessionControllerClient>(); |
// Must be available at login screen, so initialize before profile. |
system_tray_client_ = base::MakeUnique<SystemTrayClient>(); |
@@ -72,7 +60,6 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { |
keyboard::InitializeKeyboard(); |
ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); |
-#endif // defined(OS_CHROMEOS) |
} |
void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
@@ -101,7 +88,6 @@ void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
} |
void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
-#if defined(OS_CHROMEOS) |
vpn_list_forwarder_.reset(); |
volume_controller_.reset(); |
new_window_client_.reset(); |
@@ -109,6 +95,6 @@ void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
media_client_.reset(); |
cast_config_client_media_router_.reset(); |
session_controller_client_.reset(); |
-#endif |
+ |
chrome::CloseAsh(); |
} |