| 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/window_pin_type.h" |
| 8 #include "ash/public/cpp/window_properties.h" | 9 #include "ash/public/cpp/window_properties.h" |
| 10 #include "ash/public/interfaces/window_pin_type.mojom.h" |
| 9 #include "ash/root_window_controller.h" | 11 #include "ash/root_window_controller.h" |
| 10 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 11 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 12 #include "chrome/browser/chrome_browser_main.h" | 14 #include "chrome/browser/chrome_browser_main.h" |
| 13 #include "chrome/browser/ui/ash/ash_init.h" | 15 #include "chrome/browser/ui/ash/ash_init.h" |
| 14 #include "chrome/browser/ui/ash/ash_util.h" | 16 #include "chrome/browser/ui/ash/ash_util.h" |
| 15 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" | 17 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" |
| 16 #include "chrome/browser/ui/ash/chrome_new_window_client.h" | 18 #include "chrome/browser/ui/ash/chrome_new_window_client.h" |
| 17 #include "chrome/browser/ui/ash/chrome_shell_content_state.h" | 19 #include "chrome/browser/ui/ash/chrome_shell_content_state.h" |
| 18 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" | 20 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 47 aura::PropertyConverter* converter = delegate->GetPropertyConverter(); | 49 aura::PropertyConverter* converter = delegate->GetPropertyConverter(); |
| 48 | 50 |
| 49 converter->RegisterProperty( | 51 converter->RegisterProperty( |
| 50 ash::kPanelAttachedKey, | 52 ash::kPanelAttachedKey, |
| 51 ui::mojom::WindowManager::kPanelAttached_Property, | 53 ui::mojom::WindowManager::kPanelAttached_Property, |
| 52 aura::PropertyConverter::CreateAcceptAnyValueCallback()); | 54 aura::PropertyConverter::CreateAcceptAnyValueCallback()); |
| 53 converter->RegisterProperty( | 55 converter->RegisterProperty( |
| 54 ash::kShelfItemTypeKey, | 56 ash::kShelfItemTypeKey, |
| 55 ui::mojom::WindowManager::kShelfItemType_Property, | 57 ui::mojom::WindowManager::kShelfItemType_Property, |
| 56 base::Bind(&ash::IsValidShelfItemType)); | 58 base::Bind(&ash::IsValidShelfItemType)); |
| 59 converter->RegisterProperty(ash::kWindowPinTypeKey, |
| 60 ash::mojom::kWindowPinType_Property, |
| 61 base::Bind(&ash::IsValidWindowPinType)); |
| 57 | 62 |
| 58 mus_client->SetMusPropertyMirror( | 63 mus_client->SetMusPropertyMirror( |
| 59 base::MakeUnique<ash::MusPropertyMirrorAsh>()); | 64 base::MakeUnique<ash::MusPropertyMirrorAsh>()); |
| 60 } | 65 } |
| 61 } | 66 } |
| 62 | 67 |
| 63 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { | 68 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { |
| 64 if (ash_util::ShouldOpenAshOnStartup()) | 69 if (ash_util::ShouldOpenAshOnStartup()) |
| 65 ash_init_ = base::MakeUnique<AshInit>(); | 70 ash_init_ = base::MakeUnique<AshInit>(); |
| 66 | 71 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 vpn_list_forwarder_.reset(); | 119 vpn_list_forwarder_.reset(); |
| 115 volume_controller_.reset(); | 120 volume_controller_.reset(); |
| 116 new_window_client_.reset(); | 121 new_window_client_.reset(); |
| 117 system_tray_client_.reset(); | 122 system_tray_client_.reset(); |
| 118 media_client_.reset(); | 123 media_client_.reset(); |
| 119 cast_config_client_media_router_.reset(); | 124 cast_config_client_media_router_.reset(); |
| 120 session_controller_client_.reset(); | 125 session_controller_client_.reset(); |
| 121 | 126 |
| 122 ash_init_.reset(); | 127 ash_init_.reset(); |
| 123 } | 128 } |
| OLD | NEW |