Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2848)

Unified Diff: ash/mus/window_manager.cc

Issue 2889443002: mash: Add type names to PropertyConverter::Register*Property. (Closed)
Patch Set: Rename to RegisterImageSkiaProperty, update test identifiers. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 98e41b45ab8e8e879920922e0bc3c53e56d7386e..6c9e65887aa198bd0649d277cd10a618b1b985cb 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -82,25 +82,25 @@ WindowManager::WindowManager(service_manager::Connector* connector,
show_primary_host_on_connect_(show_primary_host_on_connect),
wm_state_(base::MakeUnique<::wm::WMState>()),
property_converter_(base::MakeUnique<aura::PropertyConverter>()) {
- property_converter_->RegisterProperty(
+ property_converter_->RegisterPrimitiveProperty(
kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property,
aura::PropertyConverter::CreateAcceptAnyValueCallback());
- property_converter_->RegisterProperty(
+ property_converter_->RegisterPrimitiveProperty(
kRenderTitleAreaProperty,
ui::mojom::WindowManager::kRenderParentTitleArea_Property,
aura::PropertyConverter::CreateAcceptAnyValueCallback());
- property_converter_->RegisterProperty(
- kShelfIDKey, ui::mojom::WindowManager::kShelfID_Property);
- property_converter_->RegisterProperty(
+ property_converter_->RegisterPrimitiveProperty(
kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property,
base::Bind(&IsValidShelfItemType));
- property_converter_->RegisterProperty(
+ property_converter_->RegisterPrimitiveProperty(
::wm::kShadowElevationKey,
ui::mojom::WindowManager::kShadowElevation_Property,
base::Bind(&::wm::IsValidShadowElevation));
- property_converter_->RegisterProperty(kWindowPinTypeKey,
- ash::mojom::kWindowPinType_Property,
- base::Bind(&ash::IsValidWindowPinType));
+ property_converter_->RegisterPrimitiveProperty(
+ kWindowPinTypeKey, ash::mojom::kWindowPinType_Property,
+ base::Bind(&ash::IsValidWindowPinType));
+ property_converter_->RegisterStringProperty(
+ kShelfIDKey, ui::mojom::WindowManager::kShelfID_Property);
}
WindowManager::~WindowManager() {
« no previous file with comments | « no previous file | chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698