fix property linkage warnings

ash/wm/workspace/workspace_layout_manager.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/wm/workspace/workspace_layout_manager.h"
 
 #include "ash/screen_ash.h"
-#include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
+#include "ash/wm/window_properties.h"
 #include "ash/wm/workspace/workspace.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura/window_property.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace ash {
 namespace internal {
 
 WorkspaceLayoutManager::WorkspaceLayoutManager(
     aura::RootWindow* root_window,
     WorkspaceManager* workspace_manager)
@@ skipping 52 matching lines @@
     BaseLayoutManager::SetChildBounds(child, requested_bounds);
   else
     SetChildBoundsDirect(child, requested_bounds);
   workspace_manager_->UpdateShelfVisibility();
 }
 
 void WorkspaceLayoutManager::OnWindowPropertyChanged(aura::Window* window,
                                                      const void* key,
                                                      intptr_t old) {
   BaseLayoutManager::OnWindowPropertyChanged(window, key, old);
-  if (key == ash::kWindowTrackedByWorkspacePropKey &&
+  if (key == ash::internal::kWindowTrackedByWorkspaceKey &&
       ash::GetTrackedByWorkspace(window)) {
     // We currently don't need to support transitioning from true to false, so
     // we ignore it.
     workspace_manager_->AddWindow(window);
   }
 }
 
 void WorkspaceLayoutManager::ShowStateChanged(
     aura::Window* window,
     ui::WindowShowState last_show_state) {
   if (workspace_manager_->IsManagedWindow(window)) {
     if (wm::IsWindowMinimized(window)) {
       workspace_manager_->RemoveWindow(window);
     } else if ((window->TargetVisibility() ||
                 last_show_state == ui::SHOW_STATE_MINIMIZED) &&
                !workspace_manager_->IsManagingWindow(window)) {
       workspace_manager_->AddWindow(window);
     }
   } else {
     workspace_manager_->UpdateShelfVisibility();
   }
   BaseLayoutManager::ShowStateChanged(window, last_show_state);
   workspace_manager_->ShowStateChanged(window);
 }
 
 }  // namespace internal
 }  // namespace ash