Revert 114095 - Move the concept of Activation to the Shell.

ui/aura_shell/window_util.cc

Index: ui/aura_shell/window_util.cc
===================================================================
--- ui/aura_shell/window_util.cc	(revision 114099)
+++ ui/aura_shell/window_util.cc	(working copy)
@@ -4,11 +4,8 @@
 
 #include "ui/aura_shell/window_util.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/activation_controller.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/base/ui_base_types.h"
 
 namespace aura_shell {
@@ -18,24 +15,4 @@
       ui::SHOW_STATE_MAXIMIZED;
 }
 
-void ActivateWindow(aura::Window* window) {
-  aura::ActivationClient::GetActivationClient()->ActivateWindow(window);
-}
-
-void DeactivateWindow(aura::Window* window) {
-  aura::ActivationClient::GetActivationClient()->DeactivateWindow(window);
-}
-
-bool IsActiveWindow(aura::Window* window) {
-  return GetActiveWindow() == window;
-}
-
-aura::Window* GetActiveWindow() {
-  return aura::ActivationClient::GetActivationClient()->GetActiveWindow();
-}
-
-aura::Window* GetActivatableWindow(aura::Window* window) {
-  return internal::ActivationController::GetActivatableWindow(window);
-}
-
 }  // namespace aura_shell
Property changes on: ui\aura_shell\window_util.cc
___________________________________________________________________
Added: svn:mergeinfo