| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ui/aura/mus/property_converter.h" | 5 #include "ui/aura/mus/property_converter.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "mojo/public/cpp/bindings/type_converter.h" | 8 #include "mojo/public/cpp/bindings/type_converter.h" |
| 9 #include "services/ui/public/cpp/property_type_converters.h" | 9 #include "services/ui/public/cpp/property_type_converters.h" |
| 10 #include "services/ui/public/interfaces/window_manager.mojom.h" | 10 #include "services/ui/public/interfaces/window_manager.mojom.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 return base::Bind(&AlwaysTrue); | 64 return base::Bind(&AlwaysTrue); |
| 65 } | 65 } |
| 66 | 66 |
| 67 PropertyConverter::PropertyConverter() { | 67 PropertyConverter::PropertyConverter() { |
| 68 // Add known aura properties with associated mus properties. | 68 // Add known aura properties with associated mus properties. |
| 69 RegisterProperty(client::kAlwaysOnTopKey, | 69 RegisterProperty(client::kAlwaysOnTopKey, |
| 70 ui::mojom::WindowManager::kAlwaysOnTop_Property, | 70 ui::mojom::WindowManager::kAlwaysOnTop_Property, |
| 71 CreateAcceptAnyValueCallback()); | 71 CreateAcceptAnyValueCallback()); |
| 72 RegisterProperty(client::kAppIconKey, | 72 RegisterProperty(client::kAppIconKey, |
| 73 ui::mojom::WindowManager::kAppIcon_Property); | 73 ui::mojom::WindowManager::kAppIcon_Property); |
| 74 RegisterProperty(client::kAppIdKey, | |
| 75 ui::mojom::WindowManager::kAppID_Property); | |
| 76 RegisterProperty(client::kImmersiveFullscreenKey, | 74 RegisterProperty(client::kImmersiveFullscreenKey, |
| 77 ui::mojom::WindowManager::kImmersiveFullscreen_Property, | 75 ui::mojom::WindowManager::kImmersiveFullscreen_Property, |
| 78 CreateAcceptAnyValueCallback()); | 76 CreateAcceptAnyValueCallback()); |
| 79 RegisterProperty(client::kNameKey, ui::mojom::WindowManager::kName_Property); | 77 RegisterProperty(client::kNameKey, ui::mojom::WindowManager::kName_Property); |
| 80 RegisterProperty(client::kPreferredSize, | 78 RegisterProperty(client::kPreferredSize, |
| 81 ui::mojom::WindowManager::kPreferredSize_Property); | 79 ui::mojom::WindowManager::kPreferredSize_Property); |
| 82 RegisterProperty(client::kResizeBehaviorKey, | 80 RegisterProperty(client::kResizeBehaviorKey, |
| 83 ui::mojom::WindowManager::kResizeBehavior_Property, | 81 ui::mojom::WindowManager::kResizeBehavior_Property, |
| 84 base::Bind(&ValidateResizeBehaviour)); | 82 base::Bind(&ValidateResizeBehaviour)); |
| 85 RegisterProperty(client::kRestoreBoundsKey, | 83 RegisterProperty(client::kRestoreBoundsKey, |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 } | 317 } |
| 320 | 318 |
| 321 void PropertyConverter::RegisterProperty( | 319 void PropertyConverter::RegisterProperty( |
| 322 const WindowProperty<base::string16*>* property, | 320 const WindowProperty<base::string16*>* property, |
| 323 const char* transport_name) { | 321 const char* transport_name) { |
| 324 string16_properties_[property] = transport_name; | 322 string16_properties_[property] = transport_name; |
| 325 transport_names_.insert(transport_name); | 323 transport_names_.insert(transport_name); |
| 326 } | 324 } |
| 327 | 325 |
| 328 } // namespace aura | 326 } // namespace aura |
| OLD | NEW |