Refactor and push window properties up to class properties.

ash/mus/root_window_controller.cc

 // Copyright 2016 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/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 23 matching lines @@
 #include "mojo/public/cpp/bindings/type_converter.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/common/util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/property_utils.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/display_list.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::RootWindowController*);
+DECLARE_CLASS_PROPERTY_TYPE(ash::mus::RootWindowController*);
 
 namespace ash {
 namespace mus {
 namespace {
 
-DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ash::mus::RootWindowController*,
-                                 kRootWindowControllerKey,
-                                 nullptr);
+DEFINE_LOCAL_CLASS_PROPERTY_KEY(ash::mus::RootWindowController*,
+                                kRootWindowControllerKey,
+                                nullptr);
 
 bool IsFullscreen(aura::PropertyConverter* property_converter,
                   const std::vector<uint8_t>& transport_data) {
   using ui::mojom::WindowManager;
   aura::PropertyConverter::PrimitiveType show_state = 0;
   return property_converter->GetPropertyValueFromTransportValue(
              WindowManager::kShowState_Property, transport_data, &show_state) &&
          (static_cast<ui::WindowShowState>(show_state) ==
           ui::SHOW_STATE_FULLSCREEN);
 }
@@ skipping 167 matching lines @@
   } else {
     width = root()->bounds().width() - 240;
     height = root()->bounds().height() - 240;
   }
   return gfx::Rect(40 + (window_count_ % 4) * 40, 40 + (window_count_ % 4) * 40,
                    width, height);
 }
 
 }  // namespace mus
 }  // namespace ash