Shell related switches -> aura shell switches.

ui/aura_shell/toplevel_layout_manager.cc

 // Copyright (c) 2011 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 "ui/aura_shell/toplevel_layout_manager.h"
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/shelf_layout_manager.h"
 #include "ui/aura_shell/window_util.h"
@@ skipping 10 matching lines @@
   for (Windows::const_iterator i = windows_.begin(); i != windows_.end(); ++i)
     (*i)->RemoveObserver(this);
 }
 
 void ToplevelLayoutManager::OnWindowResized() {
 }
 
 void ToplevelLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
   windows_.insert(child);
   child->AddObserver(this);
-  if (child->GetProperty(aura::kShowStateKey)) {
+  if (child->GetProperty(aura::client::kShowStateKey)) {
     UpdateBoundsFromShowState(child);
     UpdateShelfVisibility();
   }
 }
 
 void ToplevelLayoutManager::OnWillRemoveWindowFromLayout(
     aura::Window* child) {
   windows_.erase(child);
   child->RemoveObserver(this);
   UpdateShelfVisibility();
@@ skipping 12 matching lines @@
   if (child_bounds.y() < 0)
     child_bounds.set_y(0);
   else if (child_bounds.y() + kTitleHeight > work_area.bottom())
     child_bounds.set_y(work_area.bottom() - kTitleHeight);
   SetChildBoundsDirect(child, child_bounds);
 }
 
 void ToplevelLayoutManager::OnWindowPropertyChanged(aura::Window* window,
                                                     const char* name,
                                                     void* old) {
-  if (name == aura::kShowStateKey) {
+  if (name == aura::client::kShowStateKey) {
     UpdateBoundsFromShowState(window);
     UpdateShelfVisibility();
   }
 }
 
 void ToplevelLayoutManager::UpdateShelfVisibility() {
   if (!shelf_)
     return;
 
   bool has_fullscreen_window = false;
   for (Windows::const_iterator i = windows_.begin(); i != windows_.end(); ++i) {
-    if ((*i)->GetIntProperty(aura::kShowStateKey) ==
+    if ((*i)->GetIntProperty(aura::client::kShowStateKey) ==
         ui::SHOW_STATE_FULLSCREEN) {
       has_fullscreen_window = true;
       break;
     }
   }
   shelf_->SetVisible(!has_fullscreen_window);
 }
 
 }  // namespace internal
 }  // namespace aura_shell