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 "ash/wm/window_properties.h" | 9 #include "ash/wm/window_properties.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
11 #include "chrome/browser/chrome_browser_main.h" | 11 #include "chrome/browser/chrome_browser_main.h" |
12 #include "chrome/browser/ui/ash/ash_init.h" | 12 #include "chrome/browser/ui/ash/ash_init.h" |
13 #include "chrome/browser/ui/ash/ash_util.h" | 13 #include "chrome/browser/ui/ash/ash_util.h" |
14 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" | 14 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" |
15 #include "chrome/browser/ui/ash/chrome_new_window_client.h" | 15 #include "chrome/browser/ui/ash/chrome_new_window_client.h" |
16 #include "chrome/browser/ui/ash/chrome_shell_content_state.h" | 16 #include "chrome/browser/ui/ash/chrome_shell_content_state.h" |
17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" | 17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" |
18 #include "chrome/browser/ui/ash/media_client.h" | 18 #include "chrome/browser/ui/ash/media_client.h" |
19 #include "chrome/browser/ui/ash/session_controller_client.h" | 19 #include "chrome/browser/ui/ash/session_controller_client.h" |
20 #include "chrome/browser/ui/ash/system_tray_client.h" | 20 #include "chrome/browser/ui/ash/system_tray_client.h" |
21 #include "chrome/browser/ui/ash/volume_controller.h" | 21 #include "chrome/browser/ui/ash/volume_controller.h" |
22 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" | 22 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" |
23 #include "chrome/browser/ui/views/ash/tab_scrubber.h" | 23 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
24 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" | 24 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" |
25 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" | 25 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" |
26 #include "chrome/browser/ui/views/select_file_dialog_extension.h" | 26 #include "chrome/browser/ui/views/select_file_dialog_extension.h" |
27 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" | 27 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
28 #include "ui/aura/client/aura_constants.h" | 28 #include "ui/aura/client/aura_constants.h" |
29 #include "ui/aura/mus/property_converter.h" | 29 #include "ui/aura/mus/property_converter.h" |
30 #include "ui/aura/window_property.h" | 30 #include "ui/base/class_property.h" |
31 #include "ui/keyboard/content/keyboard.h" | 31 #include "ui/keyboard/content/keyboard.h" |
32 #include "ui/keyboard/keyboard_controller.h" | 32 #include "ui/keyboard/keyboard_controller.h" |
33 #include "ui/views/mus/mus_client.h" | 33 #include "ui/views/mus/mus_client.h" |
34 #include "ui/views/mus/mus_property_mirror.h" | 34 #include "ui/views/mus/mus_property_mirror.h" |
35 | 35 |
36 // Relays aura content window properties to its root window (the mash frame). | 36 // Relays aura content window properties to its root window (the mash frame). |
37 // Ash relies on various window properties for frame titles, shelf items, etc. | 37 // Ash relies on various window properties for frame titles, shelf items, etc. |
38 // These properties are read from the client's root, not child content windows. | 38 // These properties are read from the client's root, not child content windows. |
39 class MusPropertyMirrorAsh : public views::MusPropertyMirror { | 39 class MusPropertyMirrorAsh : public views::MusPropertyMirror { |
40 public: | 40 public: |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 vpn_list_forwarder_.reset(); | 151 vpn_list_forwarder_.reset(); |
152 volume_controller_.reset(); | 152 volume_controller_.reset(); |
153 new_window_client_.reset(); | 153 new_window_client_.reset(); |
154 system_tray_client_.reset(); | 154 system_tray_client_.reset(); |
155 media_client_.reset(); | 155 media_client_.reset(); |
156 cast_config_client_media_router_.reset(); | 156 cast_config_client_media_router_.reset(); |
157 session_controller_client_.reset(); | 157 session_controller_client_.reset(); |
158 | 158 |
159 chrome::CloseAsh(); | 159 chrome::CloseAsh(); |
160 } | 160 } |
OLD | NEW |