Shell related switches -> aura shell switches.

ui/aura_shell/modal_container_layout_manager.cc

Index: ui/aura_shell/modal_container_layout_manager.cc
===================================================================
--- ui/aura_shell/modal_container_layout_manager.cc	(revision 114849)
+++ ui/aura_shell/modal_container_layout_manager.cc	(working copy)
@@ -66,14 +66,14 @@
 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);
 }
 
@@ -94,10 +94,10 @@
 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);