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 
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=165719
Review URL: https://codereview.chromium.org/11368010

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

5 files changed, 17 insertions, 9 deletions

diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index deabfdd..43f4da7 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -185,6 +185,7 @@
         }],  # use_aura==1
         ['chromeos==1', {
           'dependencies': [
+            '../ash/ash.gyp:ash',
             '../chromeos/chromeos.gyp:chromeos',
            ],
         }], # chromeos==1
diff --git a/content/shell/DEPS b/content/shell/DEPS
index 64bcfea..b7fd438 100644
--- a/content/shell/DEPS
+++ b/content/shell/DEPS
@@ -19,6 +19,8 @@ include_rules = [
   # The content_shell for aura must work with the views and aura
   "+ui/aura",
   "+ui/views",
+  # Ash is needed for ScreenAsh on ChromeOS.
+  "+ash",
 
   # For WebTestRunner library
   "+third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public",
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc
index aa6b765..fa58914 100644
--- a/content/shell/shell_aura.cc
+++ b/content/shell/shell_aura.cc
@@ -29,6 +29,7 @@
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/screen_ash.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/shell/shell_stacking_client_ash.h"
 #else
@@ -192,7 +193,7 @@ class ShellWindowDelegateView : public WidgetDelegateView,
 
     layout->AddPaddingRow(0, 5);
   }
-  // Overriden from TextfieldController
+  // Overridden from TextfieldController
   virtual void ContentsChanged(Textfield* sender,
                                const string16& new_contents) OVERRIDE {
   }
@@ -211,7 +212,7 @@ class ShellWindowDelegateView : public WidgetDelegateView,
    return false;
   }
 
-  // Overriden from ButtonListener
+  // Overridden from ButtonListener
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE {
     if (sender == back_button_)
       shell_->GoBackOrForward(-1);
@@ -223,7 +224,7 @@ class ShellWindowDelegateView : public WidgetDelegateView,
       shell_->Stop();
   }
 
-  // Overriden from WidgetDelegateView
+  // Overridden from WidgetDelegateView
   virtual bool CanResize() const OVERRIDE { return true; }
   virtual bool CanMaximize() const OVERRIDE { return true; }
   virtual string16 GetWindowTitle() const OVERRIDE {
@@ -237,7 +238,7 @@ class ShellWindowDelegateView : public WidgetDelegateView,
   }
   virtual View* GetContentsView() OVERRIDE { return this; }
 
-  // Overriden from View
+  // Overridden from View
   virtual void ViewHierarchyChanged(bool is_add,
                                     View* parent,
                                     View* child) OVERRIDE {
@@ -285,11 +286,13 @@ void Shell::PlatformInitialize() {
   aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);
 #if defined(OS_CHROMEOS)
   stacking_client_ = new content::ShellStackingClientAsh();
+  gfx::Screen::SetScreenInstance(
+      gfx::SCREEN_TYPE_NATIVE, new ash::ScreenAsh);
 #else
   stacking_client_ = new aura::DesktopStackingClient();
-#endif
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, aura::CreateDesktopScreen());
+#endif
   views_delegate_ = new ShellViewsDelegateAura();
 }
 
diff --git a/content/shell/shell_stacking_client_ash.cc b/content/shell/shell_stacking_client_ash.cc
index 2890270..5e3fc8a 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::shared::RootWindowCaptureClient(root_window_.get()));
+        new aura::client::DefaultCaptureClient(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 c059044..da8095f 100644
--- a/content/shell/shell_stacking_client_ash.h
+++ b/content/shell/shell_stacking_client_ash.h
@@ -12,10 +12,12 @@
 namespace aura {
 class RootWindow;
 class Window;
+namespace client {
+class DefaultCaptureClient;
+}
 namespace shared {
 class CompoundEventFilter;
 class InputMethodEventFilter;
-class RootWindowCaptureClient;
 }
 namespace test {
 class TestActivationClient;
@@ -46,7 +48,7 @@ class ShellStackingClientAsh : public aura::client::StackingClient {
   // Owned by RootWindow
   aura::shared::CompoundEventFilter* root_window_event_filter_;
 
-  scoped_ptr<aura::shared::RootWindowCaptureClient> capture_client_;
+  scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
   scoped_ptr<aura::test::TestActivationClient> test_activation_client_;