Shell related switches -> aura shell switches.

ui/aura_shell/shadow_controller.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/shadow_controller.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "ui/aura/aura_switches.h"
-#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
+#include "ui/aura_shell/aura_shell_switches.h"
 #include "ui/aura_shell/shadow.h"
 #include "ui/aura_shell/shadow_types.h"
 #include "ui/aura_shell/window_properties.h"
 
 using std::make_pair;
 
 namespace aura_shell {
 namespace internal {
 
 namespace {
 
 ShadowType GetShadowTypeFromWindowType(aura::Window* window) {
   switch (window->type()) {
-    case aura::WINDOW_TYPE_NORMAL:
+    case aura::client::WINDOW_TYPE_NORMAL:
       return CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAuraTranslucentFrames) ?
               SHADOW_TYPE_NONE : SHADOW_TYPE_RECTANGULAR;
-    case aura::WINDOW_TYPE_MENU:
-    case aura::WINDOW_TYPE_TOOLTIP:
+    case aura::client::WINDOW_TYPE_MENU:
+    case aura::client::WINDOW_TYPE_TOOLTIP:
       return SHADOW_TYPE_RECTANGULAR;
     default:
       break;
   }
   return SHADOW_TYPE_NONE;
 }
 
 }  // namespace
 
 ShadowController::ShadowController() {
@@ skipping 65 matching lines @@
   window_shadows_.insert(make_pair(window, shadow));
 
   shadow->Init();
   shadow->SetContentBounds(gfx::Rect(window->bounds().size()));
   shadow->layer()->SetVisible(ShouldShowShadowForWindow(window));
   window->layer()->Add(shadow->layer());
 }
 
 }  // namespace internal
 }  // namespace aura_shell