mash: Add type names to PropertyConverter::Register*Property.

ash/mus/window_manager.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 64 matching lines @@
 
 // TODO: need to register OSExchangeDataProviderMus. http://crbug.com/665077.
 WindowManager::WindowManager(service_manager::Connector* connector,
                              Config config,
                              bool show_primary_host_on_connect)
     : connector_(connector),
       config_(config),
       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() {
   Shutdown();
   ash::Shell::set_window_tree_client(nullptr);
   ash::Shell::set_window_manager_client(nullptr);
 }
 
 void WindowManager::Init(
     std::unique_ptr<aura::WindowTreeClient> window_tree_client,
@@ skipping 467 matching lines @@
 bool WindowManager::IsWindowActive(aura::Window* window) {
   return Shell::Get()->activation_client()->GetActiveWindow() == window;
 }
 
 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
   Shell::Get()->activation_client()->DeactivateWindow(window);
 }
 
 }  // namespace mus
 }  // namespace ash