Move aura shared and desktop classes to the views target. Note that the files don't actually move, …

content/shell/shell_aura.cc

 // Copyright (c) 2012 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 "content/shell/shell.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/desktop/desktop_screen.h"
 #include "ui/aura/display_manager.h"
@@ skipping 11 matching lines @@
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
 #include "ui/views/widget/widget.h"
 #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
 #include "ui/aura/desktop/desktop_stacking_client.h"
 #endif
 
 // ViewDelegate implementation for aura content shell
 class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate {
  public:
   ShellViewsDelegateAura() : use_transparent_windows_(false) {
@@ skipping 143 matching lines @@
     layout->AddPaddingRow(0, 5);
 
     // Add web contents view as the second row
     {
       layout->StartRow(1, 0);
       layout->AddView(contents_view_);
     }
 
     layout->AddPaddingRow(0, 5);
   }
-  // Overriden from TextfieldController
+  // Overridden from TextfieldController
   virtual void ContentsChanged(Textfield* sender,
                                const string16& new_contents) OVERRIDE {
   }
   virtual bool HandleKeyEvent(Textfield* sender,
                               const ui::KeyEvent& key_event) OVERRIDE {
    if (sender == url_entry_ && key_event.key_code() == ui::VKEY_RETURN) {
      std::string text = UTF16ToUTF8(url_entry_->text());
      GURL url(text);
      if (!url.has_scheme()) {
        url = GURL(std::string("http://") + std::string(text));
        url_entry_->SetText(ASCIIToUTF16(url.spec()));
      }
      shell_->LoadURL(url);
      return true;
    }
    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);
     else if (sender == forward_button_)
       shell_->GoBackOrForward(1);
     else if (sender == refresh_button_)
       shell_->Reload();
     else if (sender == stop_button_)
       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 {
     return title_;
   }
   virtual void WindowClosing() OVERRIDE {
     if (shell_) {
       delete shell_;
       shell_ = NULL;
     }
   }
   virtual View* GetContentsView() OVERRIDE { return this; }
 
-  // Overriden from View
+  // Overridden from View
   virtual void ViewHierarchyChanged(bool is_add,
                                     View* parent,
                                     View* child) OVERRIDE {
     if (is_add && child == this) {
       InitShellWindow();
     }
   }
 
  private:
   // Hold a reference of Shell for deleting it when the window is closing
@@ skipping 27 matching lines @@
 views::ViewsDelegate* Shell::views_delegate_ = NULL;
 
 // static
 void Shell::PlatformInitialize() {
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Initialize();
 #endif
   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();
 }
 
 void Shell::PlatformExit() {
   if (stacking_client_)
     delete stacking_client_;
   if (views_delegate_)
     delete views_delegate_;
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Shutdown();
@@ skipping 50 matching lines @@
 }
 
 void Shell::PlatformSetTitle(const string16& title) {
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetWindowTitle(title);
   window_widget_->UpdateWindowTitle();
 }
 
 }  // namespace content