Revert r229671 "aura: Allow creating content_shell without views."

http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder%20%28deps%29/builds/74852/steps/compile/logs/stdio

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

10 files changed, 314 insertions, 577 deletions

diff --git a/build/build_config.h b/build/build_config.h
index 4856614..3ea3ddc 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -31,7 +31,7 @@
 #elif defined(__linux__)
 #define OS_LINUX 1
 // Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined.
-#if !defined(TOOLKIT_VIEWS) && defined(USE_X11) && !defined(USE_AURA)
+#if !defined(TOOLKIT_VIEWS) && defined(USE_X11)
 #define TOOLKIT_GTK
 #endif
 #if defined(__GLIBC__) && !defined(__UCLIBC__)
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 86ff67b..6c0f624 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -129,7 +129,6 @@
         'shell/browser/shell_speech_recognition_manager_delegate.h',
         'shell/browser/shell_url_request_context_getter.cc',
         'shell/browser/shell_url_request_context_getter.h',
-        'shell/browser/shell_views.cc',
         'shell/browser/shell_web_contents_view_delegate_android.cc',
         'shell/browser/shell_web_contents_view_delegate_creator.h',
         'shell/browser/shell_web_contents_view_delegate_gtk.cc',
@@ -218,28 +217,15 @@
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
             '../ui/base/strings/ui_strings.gyp:ui_strings',
+            '../ui/views/controls/webview/webview.gyp:webview',
+            '../ui/views/views.gyp:views',
+            '../ui/views/views.gyp:views_test_support',
+            '../ui/ui.gyp:ui_resources',
           ],
           'sources/': [
             ['exclude', 'shell/browser/shell_gtk.cc'],
             ['exclude', 'shell/browser/shell_win.cc'],
           ],
-          'conditions': [
-            ['toolkit_views==1', {
-              'dependencies': [
-                '../ui/views/controls/webview/webview.gyp:webview',
-                '../ui/views/views.gyp:views',
-                '../ui/views/views.gyp:views_test_support',
-                '../ui/ui.gyp:ui_resources',
-              ],
-              'sources/': [
-                ['exclude', 'shell/browser/shell_aura.cc'],
-              ],
-            }, {
-              'sources/': [
-                ['exclude', 'shell/browser/shell_views.cc'],
-              ],
-            }],
-          ],
         }],  # use_aura==1
         ['chromeos==1', {
           'dependencies': [
diff --git a/content/shell/DEPS b/content/shell/DEPS
index 0943fd0..cd6dea8 100644
--- a/content/shell/DEPS
+++ b/content/shell/DEPS
@@ -25,7 +25,7 @@ include_rules = [
 ]
 
 specific_include_rules = {
-  "shell_views\.cc": [
+  "shell_aura\.cc": [
     "+ui/shell"
   ],
 }
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index 8f64cdc..55cf85a 100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -29,10 +29,6 @@
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
 
-#if defined(USE_AURA) && !defined(TOOLKIT_VIEWS)
-#include "content/shell/browser/shell_aura.h"
-#endif
-
 namespace content {
 
 const int Shell::kDefaultTestWindowWidthDip = 800;
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
index ba36749..3707202 100644
--- a/content/shell/browser/shell.h
+++ b/content/shell/browser/shell.h
@@ -11,7 +11,6 @@
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
-#include "build/build_config.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ipc/ipc_channel.h"
@@ -40,10 +39,6 @@ class ViewsDelegate;
 class GURL;
 namespace content {
 
-#if defined(USE_AURA)
-class ShellAuraPlatformData;
-#endif
-
 class BrowserContext;
 class ShellDevToolsFrontend;
 class ShellJavaScriptDialogManager;
@@ -264,13 +259,9 @@ class Shell : public WebContentsDelegate,
 #if defined(OS_CHROMEOS)
   static shell::MinimalShell* minimal_shell_;
 #endif
-#if defined(TOOLKIT_VIEWS)
   static views::ViewsDelegate* views_delegate_;
 
   views::Widget* window_widget_;
-#else // defined(TOOLKIT_VIEWS)
-  scoped_ptr<ShellAuraPlatformData> platform_;
-#endif // defined(TOOLKIT_VIEWS)
 #elif defined(OS_MACOSX)
   int content_width_;
   int content_height_;
diff --git a/content/shell/browser/shell_aura.cc b/content/shell/browser/shell_aura.cc
index 2eb0dd7..7d8309a 100644
--- a/content/shell/browser/shell_aura.cc
+++ b/content/shell/browser/shell_aura.cc
@@ -4,157 +4,317 @@
 
 #include "content/shell/browser/shell.h"
 
+#include "base/command_line.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
-#include "content/shell/browser/shell_aura.h"
-#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/client/default_activation_client.h"
-#include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/env.h"
-#include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/test/test_focus_client.h"
-#include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
-#include "ui/base/ime/input_method.h"
-#include "ui/base/ime/input_method_delegate.h"
-#include "ui/base/ime/input_method_factory.h"
+#include "ui/base/accessibility/accessibility_types.h"
+#include "ui/base/clipboard/clipboard.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/events/event.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/textfield/textfield.h"
+#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/test/desktop_test_views_delegate.h"
+#include "ui/views/view.h"
+#include "ui/views/widget/desktop_aura/desktop_screen.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_delegate.h"
+
+#if defined(OS_CHROMEOS)
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "ui/aura/test/test_screen.h"
+#include "ui/shell/minimal_shell.h"
+#endif
+
+#if defined(OS_WIN)
+#include <fcntl.h>
+#include <io.h>
+#endif
 
 namespace content {
 
 namespace {
-
-class FillLayout : public aura::LayoutManager {
+// ViewDelegate implementation for aura content shell
+class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate {
  public:
-  explicit FillLayout(aura::RootWindow* root)
-      : root_(root) {
+  ShellViewsDelegateAura() : use_transparent_windows_(false) {
   }
 
-  virtual ~FillLayout() {}
-
- private:
-  // aura::LayoutManager:
-  virtual void OnWindowResized() OVERRIDE {
+  virtual ~ShellViewsDelegateAura() {
   }
 
-  virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
-    child->SetBounds(gfx::Rect(root_->GetHostSize()));
+  void SetUseTransparentWindows(bool transparent) {
+    use_transparent_windows_ = transparent;
   }
 
-  virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {
+  // Overridden from views::TestViewsDelegate:
+  virtual bool UseTransparentWindows() const OVERRIDE {
+    return use_transparent_windows_;
   }
 
-  virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {
-  }
+ private:
+  bool use_transparent_windows_;
+
+  DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegateAura);
+};
 
-  virtual void OnChildWindowVisibilityChanged(aura::Window* child,
-                                              bool visible) OVERRIDE {
+// Maintain the UI controls and web view for content shell
+class ShellWindowDelegateView : public views::WidgetDelegateView,
+                                public views::TextfieldController,
+                                public views::ButtonListener {
+ public:
+  enum UIControl {
+    BACK_BUTTON,
+    FORWARD_BUTTON,
+    STOP_BUTTON
+  };
+
+  ShellWindowDelegateView(Shell* shell)
+    : shell_(shell),
+      toolbar_view_(new View),
+      contents_view_(new View) {
   }
+  virtual ~ShellWindowDelegateView() {}
 
-  virtual void SetChildBounds(aura::Window* child,
-                              const gfx::Rect& requested_bounds) OVERRIDE {
-    SetChildBoundsDirect(child, requested_bounds);
+  // Update the state of UI controls
+  void SetAddressBarURL(const GURL& url) {
+    url_entry_->SetText(ASCIIToUTF16(url.spec()));
+  }
+  void SetWebContents(WebContents* web_contents) {
+    contents_view_->SetLayoutManager(new views::FillLayout());
+    web_view_ = new views::WebView(web_contents->GetBrowserContext());
+    web_view_->SetWebContents(web_contents);
+    web_contents->GetView()->Focus();
+    contents_view_->AddChildView(web_view_);
+    Layout();
+  }
+  void SetWindowTitle(const string16& title) { title_ = title; }
+  void EnableUIControl(UIControl control, bool is_enabled) {
+    if (control == BACK_BUTTON) {
+      back_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
+          : views::CustomButton::STATE_DISABLED);
+    } else if (control == FORWARD_BUTTON) {
+      forward_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
+          : views::CustomButton::STATE_DISABLED);
+    } else if (control == STOP_BUTTON) {
+      stop_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
+          : views::CustomButton::STATE_DISABLED);
+    }
   }
 
-  aura::RootWindow* root_;
+ private:
+  // Initialize the UI control contained in shell window
+  void InitShellWindow() {
+    set_background(views::Background::CreateStandardPanelBackground());
+
+    views::GridLayout* layout = new views::GridLayout(this);
+    SetLayoutManager(layout);
+
+    views::ColumnSet* column_set = layout->AddColumnSet(0);
+    column_set->AddPaddingColumn(0, 2);
+    column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                          views::GridLayout::USE_PREF, 0, 0);
+    column_set->AddPaddingColumn(0, 2);
+
+    layout->AddPaddingRow(0, 2);
+
+    // Add toolbar buttons and URL text field
+    {
+      layout->StartRow(0, 0);
+      views::GridLayout* toolbar_layout = new views::GridLayout(toolbar_view_);
+      toolbar_view_->SetLayoutManager(toolbar_layout);
+
+      views::ColumnSet* toolbar_column_set =
+          toolbar_layout->AddColumnSet(0);
+      // Back button
+      back_button_ = new views::LabelButton(this, ASCIIToUTF16("Back"));
+      back_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+      gfx::Size back_button_size = back_button_->GetPreferredSize();
+      toolbar_column_set->AddColumn(views::GridLayout::CENTER,
+                                    views::GridLayout::CENTER, 0,
+                                    views::GridLayout::FIXED,
+                                    back_button_size.width(),
+                                    back_button_size.width() / 2);
+      // Forward button
+      forward_button_ = new views::LabelButton(this, ASCIIToUTF16("Forward"));
+      forward_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+      gfx::Size forward_button_size = forward_button_->GetPreferredSize();
+      toolbar_column_set->AddColumn(views::GridLayout::CENTER,
+                                    views::GridLayout::CENTER, 0,
+                                    views::GridLayout::FIXED,
+                                    forward_button_size.width(),
+                                    forward_button_size.width() / 2);
+      // Refresh button
+      refresh_button_ = new views::LabelButton(this, ASCIIToUTF16("Refresh"));
+      refresh_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+      gfx::Size refresh_button_size = refresh_button_->GetPreferredSize();
+      toolbar_column_set->AddColumn(views::GridLayout::CENTER,
+                                    views::GridLayout::CENTER, 0,
+                                    views::GridLayout::FIXED,
+                                    refresh_button_size.width(),
+                                    refresh_button_size.width() / 2);
+      // Stop button
+      stop_button_ = new views::LabelButton(this, ASCIIToUTF16("Stop"));
+      stop_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+      gfx::Size stop_button_size = stop_button_->GetPreferredSize();
+      toolbar_column_set->AddColumn(views::GridLayout::CENTER,
+                                    views::GridLayout::CENTER, 0,
+                                    views::GridLayout::FIXED,
+                                    stop_button_size.width(),
+                                    stop_button_size.width() / 2);
+      toolbar_column_set->AddPaddingColumn(0, 2);
+      // URL entry
+      url_entry_ = new views::Textfield();
+      url_entry_->SetController(this);
+      toolbar_column_set->AddColumn(views::GridLayout::FILL,
+                                    views::GridLayout::FILL, 1,
+                                    views::GridLayout::USE_PREF, 0, 0);
+
+      // Fill up the first row
+      toolbar_layout->StartRow(0, 0);
+      toolbar_layout->AddView(back_button_);
+      toolbar_layout->AddView(forward_button_);
+      toolbar_layout->AddView(refresh_button_);
+      toolbar_layout->AddView(stop_button_);
+      toolbar_layout->AddView(url_entry_);
+
+      layout->AddView(toolbar_view_);
+    }
 
-  DISALLOW_COPY_AND_ASSIGN(FillLayout);
-};
+    layout->AddPaddingRow(0, 5);
 
-class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
-                                public ui::EventHandler {
- public:
-  explicit MinimalInputEventFilter(aura::RootWindow* root)
-      : root_(root),
-        input_method_(ui::CreateInputMethod(this, NULL)) {
-    input_method_->Init(true);
-    root_->AddPreTargetHandler(this);
-    root_->SetProperty(aura::client::kRootWindowInputMethodKey,
-                       input_method_.get());
+    // Add web contents view as the second row
+    {
+      layout->StartRow(1, 0);
+      layout->AddView(contents_view_);
+    }
+
+    layout->AddPaddingRow(0, 5);
+  }
+  // Overridden from TextfieldController
+  virtual void ContentsChanged(views::Textfield* sender,
+                               const string16& new_contents) OVERRIDE {
+  }
+  virtual bool HandleKeyEvent(views::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;
   }
 
-  virtual ~MinimalInputEventFilter() {
-    root_->RemovePreTargetHandler(this);
-    root_->SetProperty(aura::client::kRootWindowInputMethodKey,
-                       static_cast<ui::InputMethod*>(NULL));
+  // Overridden from ButtonListener
+  virtual void ButtonPressed(views::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();
   }
 
- private:
-  // ui::EventHandler:
-  virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
-    const ui::EventType type = event->type();
-    if (type == ui::ET_TRANSLATED_KEY_PRESS ||
-        type == ui::ET_TRANSLATED_KEY_RELEASE) {
-      // The |event| is already handled by this object, change the type of the
-      // event to ui::ET_KEY_* and pass it to the next filter.
-      static_cast<ui::TranslatedKeyEvent*>(event)->ConvertToKeyEvent();
-    } else {
-      bool handled = false;
-      if (event->HasNativeEvent())
-        handled = input_method_->DispatchKeyEvent(event->native_event());
-      else
-        handled = input_method_->DispatchFabricatedKeyEvent(*event);
-      if (handled)
-        event->StopPropagation();
+  // 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; }
 
-  // ui::InputMethodDelegate:
-  virtual bool DispatchKeyEventPostIME(
-      const base::NativeEvent& event) OVERRIDE {
-    ui::TranslatedKeyEvent aura_event(event, false /* is_char */);
-    return root_->AsRootWindowHostDelegate()->OnHostKeyEvent(
-        &aura_event);
+  // Overridden from View
+  virtual void ViewHierarchyChanged(
+      const ViewHierarchyChangedDetails& details) OVERRIDE {
+    if (details.is_add && details.child == this) {
+      InitShellWindow();
+    }
   }
 
-  virtual bool DispatchFabricatedKeyEventPostIME(ui::EventType type,
-                                                 ui::KeyboardCode key_code,
-                                                 int flags) OVERRIDE {
-    ui::TranslatedKeyEvent aura_event(type == ui::ET_KEY_PRESSED, key_code,
-                                      flags);
-    return root_->AsRootWindowHostDelegate()->OnHostKeyEvent(
-        &aura_event);
-  }
+ private:
+  // Hold a reference of Shell for deleting it when the window is closing
+  Shell* shell_;
 
-  aura::RootWindow* root_;
-  scoped_ptr<ui::InputMethod> input_method_;
+  // Window title
+  string16 title_;
 
-  DISALLOW_COPY_AND_ASSIGN(MinimalInputEventFilter);
-};
+  // Toolbar view contains forward/backward/reload button and URL entry
+  View* toolbar_view_;
+  views::LabelButton* back_button_;
+  views::LabelButton* forward_button_;
+  views::LabelButton* refresh_button_;
+  views::LabelButton* stop_button_;
+  views::Textfield* url_entry_;
 
-}
+  // Contents view contains the web contents view
+  View* contents_view_;
+  views::WebView* web_view_;
 
-ShellAuraPlatformData::ShellAuraPlatformData() {
-}
+  DISALLOW_COPY_AND_ASSIGN(ShellWindowDelegateView);
+};
 
-ShellAuraPlatformData::~ShellAuraPlatformData() {
-}
+}  // namespace
 
-void ShellAuraPlatformData::CreateWindow(int width, int height) {
-  aura::TestScreen* screen = aura::TestScreen::Create();
-  gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen);
-  root_window_.reset(screen->CreateRootWindowForPrimaryDisplay());
-  root_window_->SetHostSize(gfx::Size(width, height));
-  root_window_->ShowRootWindow();
-  root_window_->SetLayoutManager(new FillLayout(root_window_.get()));
-
-  focus_client_.reset(new aura::test::TestFocusClient());
-  aura::client::SetFocusClient(root_window_.get(), focus_client_.get());
-
-  activation_client_.reset(
-      new aura::client::DefaultActivationClient(root_window_.get()));
-  capture_client_.reset(
-      new aura::client::DefaultCaptureClient(root_window_.get()));
-  ime_filter_.reset(new MinimalInputEventFilter(root_window_.get()));
-}
+#if defined(OS_CHROMEOS)
+shell::MinimalShell* Shell::minimal_shell_ = NULL;
+#endif
+views::ViewsDelegate* Shell::views_delegate_ = NULL;
 
 // static
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
-  aura::Env::CreateInstance();
+#if defined(OS_WIN)
+  _setmode(_fileno(stdout), _O_BINARY);
+  _setmode(_fileno(stderr), _O_BINARY);
+#endif
+#if defined(OS_CHROMEOS)
+  chromeos::DBusThreadManager::Initialize();
+  gfx::Screen::SetScreenInstance(
+      gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
+  minimal_shell_ = new shell::MinimalShell(default_window_size);
+#else
+  gfx::Screen::SetScreenInstance(
+      gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
+#endif
+  views_delegate_ = new ShellViewsDelegateAura();
 }
 
 void Shell::PlatformExit() {
+  std::vector<Shell*> windows = windows_;
+  for (std::vector<Shell*>::iterator it = windows.begin();
+       it != windows.end(); ++it) {
+    (*it)->window_widget_->Close();
+  }
+#if defined(OS_CHROMEOS)
+  if (minimal_shell_)
+    delete minimal_shell_;
+#endif
+  if (views_delegate_)
+    delete views_delegate_;
+#if defined(OS_CHROMEOS)
+  chromeos::DBusThreadManager::Shutdown();
+#endif
   aura::Env::DeleteInstance();
 }
 
@@ -162,31 +322,67 @@ void Shell::PlatformCleanUp() {
 }
 
 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
+  ShellWindowDelegateView* delegate_view =
+    static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
+  if (control == BACK_BUTTON) {
+    delegate_view->EnableUIControl(ShellWindowDelegateView::BACK_BUTTON,
+        is_enabled);
+  } else if (control == FORWARD_BUTTON) {
+    delegate_view->EnableUIControl(ShellWindowDelegateView::FORWARD_BUTTON,
+        is_enabled);
+  } else if (control == STOP_BUTTON) {
+    delegate_view->EnableUIControl(ShellWindowDelegateView::STOP_BUTTON,
+        is_enabled);
+  }
 }
 
 void Shell::PlatformSetAddressBarURL(const GURL& url) {
+  ShellWindowDelegateView* delegate_view =
+    static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
+  delegate_view->SetAddressBarURL(url);
 }
 
 void Shell::PlatformSetIsLoading(bool loading) {
 }
 
 void Shell::PlatformCreateWindow(int width, int height) {
-  platform_.reset(new ShellAuraPlatformData());
-  platform_->CreateWindow(width, height);
+#if defined(OS_CHROMEOS)
+  window_widget_ =
+      views::Widget::CreateWindowWithContextAndBounds(
+          new ShellWindowDelegateView(this),
+          minimal_shell_->GetDefaultParent(NULL, NULL, gfx::Rect()),
+          gfx::Rect(0, 0, width, height));
+#else
+  window_widget_ =
+      views::Widget::CreateWindowWithBounds(new ShellWindowDelegateView(this),
+               gfx::Rect(0, 0, width, height));
+#endif
+
+  window_ = window_widget_->GetNativeWindow();
+  // Call ShowRootWindow on RootWindow created by MinimalShell without
+  // which XWindow owned by RootWindow doesn't get mapped.
+  window_->GetRootWindow()->ShowRootWindow();
+  window_widget_->Show();
 }
 
 void Shell::PlatformSetContents() {
-  platform_->window()->AddChild(web_contents_->GetView()->GetNativeView());
-  web_contents_->GetView()->GetNativeView()->Show();
+  ShellWindowDelegateView* delegate_view =
+    static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
+  delegate_view->SetWebContents(web_contents_.get());
 }
 
 void Shell::PlatformResizeSubViews() {
 }
 
 void Shell::Close() {
+  window_widget_->CloseNow();
 }
 
 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
diff --git a/content/shell/browser/shell_aura.h b/content/shell/browser/shell_aura.h
deleted file mode 100644
index cad7a30..0000000
--- a/content/shell/browser/shell_aura.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef CONTENT_SHELL_BROWSER_SHELL_AURA_H_
-#define CONTENT_SHELL_BROWSER_SHELL_AURA_H_
-
-#include "base/memory/scoped_ptr.h"
-
-namespace aura {
-namespace client {
-class DefaultActivationClient;
-class DefaultCaptureClient;
-class FocusClient;
-}
-class RootWindow;
-}
-
-namespace ui {
-class EventHandler;
-}
-
-namespace content {
-
-class ShellAuraPlatformData {
- public:
-  ShellAuraPlatformData();
-  ~ShellAuraPlatformData();
-
-  void CreateWindow(int width, int height);
-
-  aura::RootWindow* window() { return root_window_.get(); }
-
- private:
-  scoped_ptr<aura::RootWindow> root_window_;
-  scoped_ptr<aura::client::FocusClient> focus_client_;
-  scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
-  scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
-  scoped_ptr<ui::EventHandler> ime_filter_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellAuraPlatformData);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_SHELL_BROWSER_SHELL_AURA_H_
diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc
deleted file mode 100644
index 7d8309a..0000000
--- a/content/shell/browser/shell_views.cc
+++ /dev/null
@@ -1,388 +0,0 @@
-// Copyright 2013 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/browser/shell.h"
-
-#include "base/command_line.h"
-#include "base/strings/utf_string_conversions.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
-#include "ui/aura/env.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
-#include "ui/base/accessibility/accessibility_types.h"
-#include "ui/base/clipboard/clipboard.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/events/event.h"
-#include "ui/gfx/screen.h"
-#include "ui/views/controls/button/label_button.h"
-#include "ui/views/controls/textfield/textfield.h"
-#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/test/desktop_test_views_delegate.h"
-#include "ui/views/view.h"
-#include "ui/views/widget/desktop_aura/desktop_screen.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
-
-#if defined(OS_CHROMEOS)
-#include "chromeos/dbus/dbus_thread_manager.h"
-#include "ui/aura/test/test_screen.h"
-#include "ui/shell/minimal_shell.h"
-#endif
-
-#if defined(OS_WIN)
-#include <fcntl.h>
-#include <io.h>
-#endif
-
-namespace content {
-
-namespace {
-// ViewDelegate implementation for aura content shell
-class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate {
- public:
-  ShellViewsDelegateAura() : use_transparent_windows_(false) {
-  }
-
-  virtual ~ShellViewsDelegateAura() {
-  }
-
-  void SetUseTransparentWindows(bool transparent) {
-    use_transparent_windows_ = transparent;
-  }
-
-  // Overridden from views::TestViewsDelegate:
-  virtual bool UseTransparentWindows() const OVERRIDE {
-    return use_transparent_windows_;
-  }
-
- private:
-  bool use_transparent_windows_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegateAura);
-};
-
-// Maintain the UI controls and web view for content shell
-class ShellWindowDelegateView : public views::WidgetDelegateView,
-                                public views::TextfieldController,
-                                public views::ButtonListener {
- public:
-  enum UIControl {
-    BACK_BUTTON,
-    FORWARD_BUTTON,
-    STOP_BUTTON
-  };
-
-  ShellWindowDelegateView(Shell* shell)
-    : shell_(shell),
-      toolbar_view_(new View),
-      contents_view_(new View) {
-  }
-  virtual ~ShellWindowDelegateView() {}
-
-  // Update the state of UI controls
-  void SetAddressBarURL(const GURL& url) {
-    url_entry_->SetText(ASCIIToUTF16(url.spec()));
-  }
-  void SetWebContents(WebContents* web_contents) {
-    contents_view_->SetLayoutManager(new views::FillLayout());
-    web_view_ = new views::WebView(web_contents->GetBrowserContext());
-    web_view_->SetWebContents(web_contents);
-    web_contents->GetView()->Focus();
-    contents_view_->AddChildView(web_view_);
-    Layout();
-  }
-  void SetWindowTitle(const string16& title) { title_ = title; }
-  void EnableUIControl(UIControl control, bool is_enabled) {
-    if (control == BACK_BUTTON) {
-      back_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
-          : views::CustomButton::STATE_DISABLED);
-    } else if (control == FORWARD_BUTTON) {
-      forward_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
-          : views::CustomButton::STATE_DISABLED);
-    } else if (control == STOP_BUTTON) {
-      stop_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
-          : views::CustomButton::STATE_DISABLED);
-    }
-  }
-
- private:
-  // Initialize the UI control contained in shell window
-  void InitShellWindow() {
-    set_background(views::Background::CreateStandardPanelBackground());
-
-    views::GridLayout* layout = new views::GridLayout(this);
-    SetLayoutManager(layout);
-
-    views::ColumnSet* column_set = layout->AddColumnSet(0);
-    column_set->AddPaddingColumn(0, 2);
-    column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
-                          views::GridLayout::USE_PREF, 0, 0);
-    column_set->AddPaddingColumn(0, 2);
-
-    layout->AddPaddingRow(0, 2);
-
-    // Add toolbar buttons and URL text field
-    {
-      layout->StartRow(0, 0);
-      views::GridLayout* toolbar_layout = new views::GridLayout(toolbar_view_);
-      toolbar_view_->SetLayoutManager(toolbar_layout);
-
-      views::ColumnSet* toolbar_column_set =
-          toolbar_layout->AddColumnSet(0);
-      // Back button
-      back_button_ = new views::LabelButton(this, ASCIIToUTF16("Back"));
-      back_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
-      gfx::Size back_button_size = back_button_->GetPreferredSize();
-      toolbar_column_set->AddColumn(views::GridLayout::CENTER,
-                                    views::GridLayout::CENTER, 0,
-                                    views::GridLayout::FIXED,
-                                    back_button_size.width(),
-                                    back_button_size.width() / 2);
-      // Forward button
-      forward_button_ = new views::LabelButton(this, ASCIIToUTF16("Forward"));
-      forward_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
-      gfx::Size forward_button_size = forward_button_->GetPreferredSize();
-      toolbar_column_set->AddColumn(views::GridLayout::CENTER,
-                                    views::GridLayout::CENTER, 0,
-                                    views::GridLayout::FIXED,
-                                    forward_button_size.width(),
-                                    forward_button_size.width() / 2);
-      // Refresh button
-      refresh_button_ = new views::LabelButton(this, ASCIIToUTF16("Refresh"));
-      refresh_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
-      gfx::Size refresh_button_size = refresh_button_->GetPreferredSize();
-      toolbar_column_set->AddColumn(views::GridLayout::CENTER,
-                                    views::GridLayout::CENTER, 0,
-                                    views::GridLayout::FIXED,
-                                    refresh_button_size.width(),
-                                    refresh_button_size.width() / 2);
-      // Stop button
-      stop_button_ = new views::LabelButton(this, ASCIIToUTF16("Stop"));
-      stop_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
-      gfx::Size stop_button_size = stop_button_->GetPreferredSize();
-      toolbar_column_set->AddColumn(views::GridLayout::CENTER,
-                                    views::GridLayout::CENTER, 0,
-                                    views::GridLayout::FIXED,
-                                    stop_button_size.width(),
-                                    stop_button_size.width() / 2);
-      toolbar_column_set->AddPaddingColumn(0, 2);
-      // URL entry
-      url_entry_ = new views::Textfield();
-      url_entry_->SetController(this);
-      toolbar_column_set->AddColumn(views::GridLayout::FILL,
-                                    views::GridLayout::FILL, 1,
-                                    views::GridLayout::USE_PREF, 0, 0);
-
-      // Fill up the first row
-      toolbar_layout->StartRow(0, 0);
-      toolbar_layout->AddView(back_button_);
-      toolbar_layout->AddView(forward_button_);
-      toolbar_layout->AddView(refresh_button_);
-      toolbar_layout->AddView(stop_button_);
-      toolbar_layout->AddView(url_entry_);
-
-      layout->AddView(toolbar_view_);
-    }
-
-    layout->AddPaddingRow(0, 5);
-
-    // Add web contents view as the second row
-    {
-      layout->StartRow(1, 0);
-      layout->AddView(contents_view_);
-    }
-
-    layout->AddPaddingRow(0, 5);
-  }
-  // Overridden from TextfieldController
-  virtual void ContentsChanged(views::Textfield* sender,
-                               const string16& new_contents) OVERRIDE {
-  }
-  virtual bool HandleKeyEvent(views::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;
-  }
-
-  // Overridden from ButtonListener
-  virtual void ButtonPressed(views::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();
-  }
-
-  // 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; }
-
-  // Overridden from View
-  virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE {
-    if (details.is_add && details.child == this) {
-      InitShellWindow();
-    }
-  }
-
- private:
-  // Hold a reference of Shell for deleting it when the window is closing
-  Shell* shell_;
-
-  // Window title
-  string16 title_;
-
-  // Toolbar view contains forward/backward/reload button and URL entry
-  View* toolbar_view_;
-  views::LabelButton* back_button_;
-  views::LabelButton* forward_button_;
-  views::LabelButton* refresh_button_;
-  views::LabelButton* stop_button_;
-  views::Textfield* url_entry_;
-
-  // Contents view contains the web contents view
-  View* contents_view_;
-  views::WebView* web_view_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellWindowDelegateView);
-};
-
-}  // namespace
-
-#if defined(OS_CHROMEOS)
-shell::MinimalShell* Shell::minimal_shell_ = NULL;
-#endif
-views::ViewsDelegate* Shell::views_delegate_ = NULL;
-
-// static
-void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
-#if defined(OS_WIN)
-  _setmode(_fileno(stdout), _O_BINARY);
-  _setmode(_fileno(stderr), _O_BINARY);
-#endif
-#if defined(OS_CHROMEOS)
-  chromeos::DBusThreadManager::Initialize();
-  gfx::Screen::SetScreenInstance(
-      gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
-  minimal_shell_ = new shell::MinimalShell(default_window_size);
-#else
-  gfx::Screen::SetScreenInstance(
-      gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
-#endif
-  views_delegate_ = new ShellViewsDelegateAura();
-}
-
-void Shell::PlatformExit() {
-  std::vector<Shell*> windows = windows_;
-  for (std::vector<Shell*>::iterator it = windows.begin();
-       it != windows.end(); ++it) {
-    (*it)->window_widget_->Close();
-  }
-#if defined(OS_CHROMEOS)
-  if (minimal_shell_)
-    delete minimal_shell_;
-#endif
-  if (views_delegate_)
-    delete views_delegate_;
-#if defined(OS_CHROMEOS)
-  chromeos::DBusThreadManager::Shutdown();
-#endif
-  aura::Env::DeleteInstance();
-}
-
-void Shell::PlatformCleanUp() {
-}
-
-void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
-  ShellWindowDelegateView* delegate_view =
-    static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
-  if (control == BACK_BUTTON) {
-    delegate_view->EnableUIControl(ShellWindowDelegateView::BACK_BUTTON,
-        is_enabled);
-  } else if (control == FORWARD_BUTTON) {
-    delegate_view->EnableUIControl(ShellWindowDelegateView::FORWARD_BUTTON,
-        is_enabled);
-  } else if (control == STOP_BUTTON) {
-    delegate_view->EnableUIControl(ShellWindowDelegateView::STOP_BUTTON,
-        is_enabled);
-  }
-}
-
-void Shell::PlatformSetAddressBarURL(const GURL& url) {
-  ShellWindowDelegateView* delegate_view =
-    static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
-  delegate_view->SetAddressBarURL(url);
-}
-
-void Shell::PlatformSetIsLoading(bool loading) {
-}
-
-void Shell::PlatformCreateWindow(int width, int height) {
-#if defined(OS_CHROMEOS)
-  window_widget_ =
-      views::Widget::CreateWindowWithContextAndBounds(
-          new ShellWindowDelegateView(this),
-          minimal_shell_->GetDefaultParent(NULL, NULL, gfx::Rect()),
-          gfx::Rect(0, 0, width, height));
-#else
-  window_widget_ =
-      views::Widget::CreateWindowWithBounds(new ShellWindowDelegateView(this),
-               gfx::Rect(0, 0, width, height));
-#endif
-
-  window_ = window_widget_->GetNativeWindow();
-  // Call ShowRootWindow on RootWindow created by MinimalShell without
-  // which XWindow owned by RootWindow doesn't get mapped.
-  window_->GetRootWindow()->ShowRootWindow();
-  window_widget_->Show();
-}
-
-void Shell::PlatformSetContents() {
-  ShellWindowDelegateView* delegate_view =
-    static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
-  delegate_view->SetWebContents(web_contents_.get());
-}
-
-void Shell::PlatformResizeSubViews() {
-}
-
-void Shell::Close() {
-  window_widget_->CloseNow();
-}
-
-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
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index 6f857e2..445c41a 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -90,7 +90,9 @@
         ['use_aura==0 and toolkit_views==0', {
           'sources/': [
             ['exclude', '^gestures/*'],
-          ],
+          ]
+        }],
+        ['toolkit_views==0', {
           'sources!': [
             'event.cc',
             'event.h',
diff --git a/ui/ui.gyp b/ui/ui.gyp
index a5a0172..29c3e52 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -399,7 +399,7 @@
             '../build/linux/system.gyp:glib',
           ],
           'conditions': [
-            ['toolkit_views==0 and use_aura==0', {
+            ['toolkit_views==0', {
               # Note: because of gyp predence rules this has to be defined as
               # 'sources/' rather than 'sources!'.
               'sources/': [