Shell related switches -> aura shell switches.

ui/aura_shell/laptop_mode_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/laptop_mode_layout_manager.h"
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/window_util.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/screen.h"
 
 namespace aura_shell {
 namespace internal {
 
 LaptopModeLayoutManager::LaptopModeLayoutManager() {
 }
 
 LaptopModeLayoutManager::~LaptopModeLayoutManager() {
   for (Windows::const_iterator i = windows_.begin(); i != windows_.end(); ++i)
     (*i)->RemoveObserver(this);
 }
 
 void LaptopModeLayoutManager::OnWindowResized() {
 }
 
 void LaptopModeLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
   windows_.insert(child);
   child->AddObserver(this);
-  if (child->GetProperty(aura::kShowStateKey))
+  if (child->GetProperty(aura::client::kShowStateKey))
     UpdateBoundsFromShowState(child);
 }
 
 void LaptopModeLayoutManager::OnWillRemoveWindowFromLayout(
     aura::Window* child) {
   windows_.erase(child);
   child->RemoveObserver(this);
 }
 
 void LaptopModeLayoutManager::OnChildWindowVisibilityChanged(
     aura::Window* child,
     bool visibile) {
 }
 
 void LaptopModeLayoutManager::SetChildBounds(
     aura::Window* child,
     const gfx::Rect& requested_bounds) {
   gfx::Rect bounds = requested_bounds;
   // Avoid a janky resize on startup by ensuring the initial bounds fill the
   // screen.
-  if (child->GetIntProperty(aura::kShowStateKey) == ui::SHOW_STATE_MAXIMIZED)
+  if (IsWindowMaximized(child))
     bounds = gfx::Screen::GetPrimaryMonitorBounds();
   SetChildBoundsDirect(child, bounds);
 }
 
 void LaptopModeLayoutManager::OnWindowPropertyChanged(aura::Window* window,
                                                       const char* name,
                                                       void* old) {
-  if (name == aura::kShowStateKey)
+  if (name == aura::client::kShowStateKey)
     UpdateBoundsFromShowState(window);
 }
 
 }  // namespace internal
 }  // namespace aura_shell