| 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/ime_driver_ash.h" | 17 #include "chrome/browser/ui/ash/ime_driver_ash.h" |
| 18 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" | 18 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" |
| 19 #include "chrome/browser/ui/views/ash/tab_scrubber.h" | 19 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
| 20 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" | 20 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" |
| 21 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" | 21 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" |
| 22 #include "chrome/common/chrome_switches.h" | 22 #include "chrome/common/chrome_switches.h" |
| 23 #include "content/public/common/service_manager_connection.h" | 23 #include "content/public/common/service_manager_connection.h" |
| 24 #include "mojo/public/cpp/bindings/strong_binding.h" | 24 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 25 #include "services/service_manager/public/cpp/connector.h" | 25 #include "services/service_manager/public/cpp/connector.h" |
| 26 #include "services/ui/public/interfaces/ime.mojom.h" | 26 #include "services/ui/public/interfaces/ime/ime.mojom.h" |
| 27 #include "ui/aura/env.h" | 27 #include "ui/aura/env.h" |
| 28 #include "ui/keyboard/content/keyboard.h" | 28 #include "ui/keyboard/content/keyboard.h" |
| 29 #include "ui/keyboard/keyboard_controller.h" | 29 #include "ui/keyboard/keyboard_controller.h" |
| 30 | 30 |
| 31 #if defined(OS_CHROMEOS) | 31 #if defined(OS_CHROMEOS) |
| 32 #include "chrome/browser/ui/ash/system_tray_client.h" | 32 #include "chrome/browser/ui/ash/system_tray_client.h" |
| 33 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" | 33 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" |
| 34 #include "chrome/browser/ui/views/select_file_dialog_extension.h" | 34 #include "chrome/browser/ui/views/select_file_dialog_extension.h" |
| 35 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" | 35 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
| 36 #endif // defined(OS_CHROMEOS) | 36 #endif // defined(OS_CHROMEOS) |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 keyboard::KeyboardController::GetInstance()); | 103 keyboard::KeyboardController::GetInstance()); |
| 104 } | 104 } |
| 105 | 105 |
| 106 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 106 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
| 107 #if defined(OS_CHROMEOS) | 107 #if defined(OS_CHROMEOS) |
| 108 vpn_list_forwarder_.reset(); | 108 vpn_list_forwarder_.reset(); |
| 109 system_tray_client_.reset(); | 109 system_tray_client_.reset(); |
| 110 #endif | 110 #endif |
| 111 chrome::CloseAsh(); | 111 chrome::CloseAsh(); |
| 112 } | 112 } |
| OLD | NEW |