Remove WmWindowProperty

ash/common/wm/panels/panel_window_resizer.cc

 // Copyright (c) 2012 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/common/wm/panels/panel_window_resizer.h"
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/window_parenting_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_window.h"
-#include "ash/common/wm_window_property.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 namespace ash {
 
 namespace {
@@ skipping 74 matching lines @@
   FinishDragging();
 }
 
 PanelWindowResizer::PanelWindowResizer(WindowResizer* next_window_resizer,
                                        wm::WindowState* window_state)
     : WindowResizer(window_state),
       next_window_resizer_(next_window_resizer),
       panel_container_(NULL),
       initial_panel_container_(NULL),
       did_move_or_resize_(false),
-      was_attached_(
-          GetTarget()->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED)),
+      was_attached_(GetTarget()->aura_window()->GetProperty(kPanelAttachedKey)),
       weak_ptr_factory_(this) {
   DCHECK(details().is_resizable);
   panel_container_ = GetTarget()->GetRootWindow()->GetChildByShellWindowId(
       kShellWindowId_PanelContainer);
   initial_panel_container_ = panel_container_;
 }
 
 bool PanelWindowResizer::AttachToLauncher(const gfx::Rect& bounds,
                                           gfx::Point* offset) {
   bool should_attach = false;
@@ skipping 31 matching lines @@
 }
 
 void PanelWindowResizer::StartedDragging() {
   // Tell the panel layout manager that we are dragging this panel before
   // attaching it so that it does not get repositioned.
   if (panel_container_)
     PanelLayoutManager::Get(panel_container_)->StartDragging(GetTarget());
   if (!was_attached_) {
     // Attach the panel while dragging, placing it in front of other panels.
     WmWindow* target = GetTarget();
-    target->SetBoolProperty(WmWindowProperty::PANEL_ATTACHED, true);
+    target->aura_window()->SetProperty(kPanelAttachedKey, true);
     // We use root window coordinates to ensure that during the drag the panel
     // is reparented to a container in the root window that has that window.
     WmWindow* target_root = target->GetRootWindow();
     WmWindow* old_parent = target->GetParent();
     target->SetParentUsingContext(target_root,
                                   target_root->GetBoundsInScreen());
     wm::ReparentTransientChildrenOfChild(target, old_parent,
                                          target->GetParent());
   }
 }
 
 void PanelWindowResizer::FinishDragging() {
   if (!did_move_or_resize_)
     return;
-  if (GetTarget()->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED) !=
+  if (GetTarget()->aura_window()->GetProperty(kPanelAttachedKey) !=
       details().should_attach_to_shelf) {
-    GetTarget()->SetBoolProperty(WmWindowProperty::PANEL_ATTACHED,
-                                 details().should_attach_to_shelf);
+    GetTarget()->aura_window()->SetProperty(kPanelAttachedKey,
+                                            details().should_attach_to_shelf);
     // We use last known location to ensure that after the drag the panel
     // is reparented to a container in the root window that has that location.
     WmWindow* target = GetTarget();
     WmWindow* target_root = target->GetRootWindow();
     WmWindow* old_parent = target->GetParent();
     target->SetParentUsingContext(target_root,
                                   gfx::Rect(last_location_, gfx::Size()));
     wm::ReparentTransientChildrenOfChild(target, old_parent,
                                          target->GetParent());
   }
 
   // If we started the drag in one root window and moved into another root
   // but then canceled the drag we may need to inform the original layout
   // manager that the drag is finished.
   if (initial_panel_container_ != panel_container_)
     PanelLayoutManager::Get(initial_panel_container_)->FinishDragging();
   if (panel_container_)
     PanelLayoutManager::Get(panel_container_)->FinishDragging();
 }
 
 void PanelWindowResizer::UpdateLauncherPosition() {
   if (panel_container_) {
     PanelLayoutManager::Get(panel_container_)
         ->shelf()
         ->UpdateIconPositionForPanel(GetTarget());
   }
 }
 
 }  // namespace ash