Shell related switches -> aura shell switches.

ui/aura_shell/workspace_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/workspace_controller.h"
 
+#include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/default_container_layout_manager.h"
 #include "ui/aura_shell/launcher/launcher.h"
 #include "ui/aura_shell/launcher/launcher_model.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/window_util.h"
 #include "ui/aura_shell/workspace/workspace.h"
 #include "ui/aura_shell/workspace/workspace_manager.h"
@@ skipping 34 matching lines @@
 void WorkspaceController::OnRootWindowResized(const gfx::Size& new_size) {
   workspace_manager_->SetWorkspaceSize(new_size);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WorkspaceController, aura::WindowObserver overrides:
 
 void WorkspaceController::OnWindowPropertyChanged(aura::Window* window,
                                                   const char* key,
                                                   void* old) {
-  if (key == aura::kRootWindowActiveWindow) {
+  if (key == aura::client::kRootWindowActiveWindow) {
     // FindBy handles NULL.
     Workspace* workspace = workspace_manager_->FindBy(GetActiveWindow());
     if (workspace)
       workspace->Activate();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WorkspaceController, aura_shell::internal::WorkspaceObserver overrides:
 
@@ skipping 45 matching lines @@
   ignore_move_event_ = true;
   workspace_manager_->RotateWindows(start, target);
   ignore_move_event_ = false;
 }
 
 void WorkspaceController::LauncherItemImagesChanged(int index) {
 }
 
 }  // namespace internal
 }  // namespace aura_shell