aura/ash cleanup: Use a single window-key for constrained windows.

ash/wm/solo_window_tracker.cc

 // Copyright 2013 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/solo_window_tracker.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/root_window_controller.h"
@@ skipping 42 matching lines @@
 // Returns true if |window| can use the solo window header. Returns false for
 // windows that are:
 // * Not drawn (for example, DragDropTracker uses one for mouse capture)
 // * Modal alerts (it looks odd for headers to change when an alert opens)
 // * Constrained windows (ditto)
 bool IsValidCandidate(aura::Window* window) {
   return window->type() == aura::client::WINDOW_TYPE_NORMAL &&
       window->layer() &&
       window->layer()->type() != ui::LAYER_NOT_DRAWN &&
       window->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_NONE &&
-      !window->GetProperty(ash::kConstrainedWindowKey);
+      !window->GetProperty(aura::client::kConstrainedWindowKey);
 }
 
 // Schedule's a paint of the window's entire bounds.
 void SchedulePaint(aura::Window* window) {
   window->SchedulePaintInRect(gfx::Rect(window->bounds().size()));
 }
 
 }  // namespace
 
 
@@ skipping 127 matching lines @@
     UpdateSoloWindow(NULL);
 }
 
 void SoloWindowTracker::OnDockBoundsChanging(const gfx::Rect& new_bounds,
                                              Reason reason) {
   dock_bounds_ = new_bounds;
   UpdateSoloWindow(NULL);
 }
 
 }  // namespace ash