Revert 132856 - Aura/ash split: Remove hacks and get chrome linking without ash.

views_unittests failure on Linux Chromeos.

For the first time now, you can do:

    > build/gyp_chromium -Duse_aura=1 -Duse_ash=0

And get a running chrome. It has lots of issues, especially related to
window placement, tab handling, etc, but it pops up and renders web content.

Also consolidates most of the desktop behavior into its own class.

Also makes views_examples_exe work again. Several of the hacks are no longer
needed after Ben's refactoring to support WebView.

BUG=116458,119759
TEST=none

Review URL: http://codereview.chromium.org/10081022

TBR=erg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10083057

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

1 files changed, 0 insertions, 7 deletions

diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc
index 0d4a1a5..2aaaed2 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -52,13 +52,6 @@ class ShellViewsDelegate : public views::TestViewsDelegate {
     return true;
   }
 
-  views::NativeWidgetHelperAura* CreateNativeWidgetHelper(
-      views::NativeWidgetAura* native_widget) OVERRIDE {
-    // The default behavior of the test delegate is to work in desktop
-    // mode. Return NULL here so NativeWidgetAura uses our RootWindow instead.
-    return NULL;
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegate);
 };