Revert 165719 - Move aura shared and desktop classes to the views target. Note that the files don't actually move, that'll come later. I'm just moving them from one target to another.

http://crbug.com/158115
R=scottmg@chromium.org
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/11368010

TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/11293072

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165724 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 6 deletions

diff --git a/content/shell/shell_stacking_client_ash.cc b/content/shell/shell_stacking_client_ash.cc
index 5e3fc8a..2890270 100644
--- a/content/shell/shell_stacking_client_ash.cc
+++ b/content/shell/shell_stacking_client_ash.cc
@@ -4,11 +4,11 @@
 
 #include "content/shell/shell_stacking_client_ash.h"
 
-#include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/shared/compound_event_filter.h"
 #include "ui/aura/shared/input_method_event_filter.h"
+#include "ui/aura/shared/root_window_capture_client.h"
 #include "ui/aura/test/test_activation_client.h"
 
 namespace content {
@@ -48,7 +48,7 @@ aura::Window* ShellStackingClientAsh::GetDefaultParent(
         new aura::test::TestActivationClient(root_window_.get()));
 
     capture_client_.reset(
-        new aura::client::DefaultCaptureClient(root_window_.get()));
+        new aura::shared::RootWindowCaptureClient(root_window_.get()));
   }
   return root_window_.get();
 }
diff --git a/content/shell/shell_stacking_client_ash.h b/content/shell/shell_stacking_client_ash.h
index da8095f..c059044 100644
--- a/content/shell/shell_stacking_client_ash.h
+++ b/content/shell/shell_stacking_client_ash.h
@@ -12,12 +12,10 @@
 namespace aura {
 class RootWindow;
 class Window;
-namespace client {
-class DefaultCaptureClient;
-}
 namespace shared {
 class CompoundEventFilter;
 class InputMethodEventFilter;
+class RootWindowCaptureClient;
 }
 namespace test {
 class TestActivationClient;
@@ -48,7 +46,7 @@ class ShellStackingClientAsh : public aura::client::StackingClient {
   // Owned by RootWindow
   aura::shared::CompoundEventFilter* root_window_event_filter_;
 
-  scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
+  scoped_ptr<aura::shared::RootWindowCaptureClient> capture_client_;
   scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
   scoped_ptr<aura::test::TestActivationClient> test_activation_client_;