| 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/public/cpp/mus_property_mirror_ash.h" | 7 #include "ash/public/cpp/mus_property_mirror_ash.h" |
| 8 #include "ash/public/cpp/shelf_model.h" |
| 8 #include "ash/public/cpp/window_pin_type.h" | 9 #include "ash/public/cpp/window_pin_type.h" |
| 9 #include "ash/public/cpp/window_properties.h" | 10 #include "ash/public/cpp/window_properties.h" |
| 10 #include "ash/public/interfaces/window_pin_type.mojom.h" | 11 #include "ash/public/interfaces/window_pin_type.mojom.h" |
| 11 #include "ash/root_window_controller.h" | 12 #include "ash/root_window_controller.h" |
| 12 #include "ash/shelf/shelf_model.h" | |
| 13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
| 14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
| 15 #include "chrome/browser/chrome_browser_main.h" | 15 #include "chrome/browser/chrome_browser_main.h" |
| 16 #include "chrome/browser/ui/ash/ash_init.h" | 16 #include "chrome/browser/ui/ash/ash_init.h" |
| 17 #include "chrome/browser/ui/ash/ash_util.h" | 17 #include "chrome/browser/ui/ash/ash_util.h" |
| 18 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" | 18 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" |
| 19 #include "chrome/browser/ui/ash/chrome_new_window_client.h" | 19 #include "chrome/browser/ui/ash/chrome_new_window_client.h" |
| 20 #include "chrome/browser/ui/ash/chrome_shell_content_state.h" | 20 #include "chrome/browser/ui/ash/chrome_shell_content_state.h" |
| 21 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 21 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| 22 #include "chrome/browser/ui/ash/lock_screen_client.h" | 22 #include "chrome/browser/ui/ash/lock_screen_client.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 volume_controller_.reset(); | 132 volume_controller_.reset(); |
| 133 new_window_client_.reset(); | 133 new_window_client_.reset(); |
| 134 system_tray_client_.reset(); | 134 system_tray_client_.reset(); |
| 135 lock_screen_client_.reset(); | 135 lock_screen_client_.reset(); |
| 136 media_client_.reset(); | 136 media_client_.reset(); |
| 137 cast_config_client_media_router_.reset(); | 137 cast_config_client_media_router_.reset(); |
| 138 session_controller_client_.reset(); | 138 session_controller_client_.reset(); |
| 139 | 139 |
| 140 ash_init_.reset(); | 140 ash_init_.reset(); |
| 141 } | 141 } |
| OLD | NEW |