Shell related switches -> aura shell switches.

ui/aura_shell/modal_container_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/modal_container_layout_manager.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
@@ skipping 48 matching lines @@
 void ModalContainerLayoutManager::OnWindowResized() {
   if (modal_screen_) {
     modal_screen_->SetBounds(gfx::Rect(0, 0, container_->bounds().width(),
                                        container_->bounds().height()));
   }
 }
 
 void ModalContainerLayoutManager::OnWindowAddedToLayout(
     aura::Window* child) {
   child->AddObserver(this);
-  if (child->GetIntProperty(aura::kModalKey))
+  if (child->GetIntProperty(aura::client::kModalKey))
     AddModalWindow(child);
 }
 
 void ModalContainerLayoutManager::OnWillRemoveWindowFromLayout(
     aura::Window* child) {
   child->RemoveObserver(this);
-  if (child->GetIntProperty(aura::kModalKey))
+  if (child->GetIntProperty(aura::client::kModalKey))
     RemoveModalWindow(child);
 }
 
 void ModalContainerLayoutManager::OnChildWindowVisibilityChanged(
     aura::Window* child,
     bool visible) {
 }
 
 void ModalContainerLayoutManager::SetChildBounds(
     aura::Window* child,
     const gfx::Rect& requested_bounds) {
   SetChildBoundsDirect(child, requested_bounds);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ModalContainerLayoutManager, aura::WindowObserver implementation:
 
 void ModalContainerLayoutManager::OnWindowPropertyChanged(aura::Window* window,
                                                           const char* key,
                                                           void* old) {
-  if (key != aura::kModalKey)
+  if (key != aura::client::kModalKey)
     return;
 
-  if (window->GetIntProperty(aura::kModalKey)) {
+  if (window->GetIntProperty(aura::client::kModalKey)) {
     AddModalWindow(window);
   } else if (static_cast<int>(reinterpret_cast<intptr_t>(old))) {
     RemoveModalWindow(window);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ModalContainerLayoutManager, ui::LayerAnimationObserver implementation:
 
 void ModalContainerLayoutManager::OnLayerAnimationEnded(
@@ skipping 70 matching lines @@
 
 void ModalContainerLayoutManager::HideModalScreen() {
   Shell::GetInstance()->RemoveRootWindowEventFilter(modality_filter_.get());
   ui::LayerAnimator::ScopedSettings settings(
       modal_screen_->GetNativeView()->layer()->GetAnimator());
   modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f);
 }
 
 }  // namespace internal
 }  // namespace aura_shell