Shell related switches -> aura shell switches.

ui/aura_shell/shell.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/shell.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "ui/aura/aura_switches.h"
-#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_types.h"
 #include "ui/aura_shell/activation_controller.h"
 #include "ui/aura_shell/app_list.h"
+#include "ui/aura_shell/aura_shell_switches.h"
 #include "ui/aura_shell/default_container_event_filter.h"
 #include "ui/aura_shell/default_container_layout_manager.h"
 #include "ui/aura_shell/root_window_event_filter.h"
 #include "ui/aura_shell/root_window_layout_manager.h"
 #include "ui/aura_shell/drag_drop_controller.h"
 #include "ui/aura_shell/laptop_mode_layout_manager.h"
 #include "ui/aura_shell/launcher/launcher.h"
 #include "ui/aura_shell/modal_container_layout_manager.h"
 #include "ui/aura_shell/shadow_controller.h"
 #include "ui/aura_shell/shelf_layout_manager.h"
@@ skipping 206 matching lines @@
     // TODO(jamescook): Adjust status area layout.
     return;
   }
 
   root_window_layout->set_background_widget(
       internal::CreateDesktopBackground());
   launcher_.reset(new Launcher(default_container));
 
   internal::ShelfLayoutManager* shelf_layout_manager =
       new internal::ShelfLayoutManager(launcher_->widget(), status_widget);
-  GetContainer(aura_shell::internal::kShellWindowId_LauncherContainer)->
+  GetContainer(internal::kShellWindowId_LauncherContainer)->
       SetLayoutManager(shelf_layout_manager);
 
   internal::StatusAreaLayoutManager* status_area_layout_manager =
       new internal::StatusAreaLayoutManager(shelf_layout_manager);
-  GetContainer(aura_shell::internal::kShellWindowId_StatusContainer)->
+  GetContainer(internal::kShellWindowId_StatusContainer)->
       SetLayoutManager(status_area_layout_manager);
 
   // Workspace manager has its own layout managers.
   if (CommandLine::ForCurrentProcess()->
           HasSwitch(switches::kAuraWorkspaceManager)) {
     EnableWorkspaceManager();
     return;
   }
 
   // Default layout manager.
   internal::ToplevelLayoutManager* toplevel_layout_manager =
       new internal::ToplevelLayoutManager();
   default_container->SetLayoutManager(toplevel_layout_manager);
   toplevel_layout_manager->set_shelf(shelf_layout_manager);
 }
 
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
-      const_cast<const aura_shell::Shell*>(this)->GetContainer(container_id));
+      const_cast<const Shell*>(this)->GetContainer(container_id));
 }
 
 const aura::Window* Shell::GetContainer(int container_id) const {
   return aura::RootWindow::GetInstance()->GetChildById(container_id);
 }
 
 void Shell::AddRootWindowEventFilter(aura::EventFilter* filter) {
   static_cast<internal::RootWindowEventFilter*>(
       aura::RootWindow::GetInstance()->event_filter())->AddFilter(filter);
 }
@@ skipping 40 matching lines @@
       new internal::WorkspaceController(default_container));
   workspace_controller_->SetLauncherModel(launcher_->model());
   default_container->SetEventFilter(
       new internal::DefaultContainerEventFilter(default_container));
   default_container->SetLayoutManager(
       new internal::DefaultContainerLayoutManager(
           workspace_controller_->workspace_manager()));
 }
 
 }  // namespace aura_shell