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

ash/shell/content_client/shell_browser_main_parts.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 "ash/shell/content_client/shell_browser_main_parts.h"
 
 #include "ash/shell/shell_delegate_impl.h"
 #include "ash/shell/window_watcher.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 34 matching lines @@
   // Overridden from views::TestViewsDelegate:
   virtual views::NonClientFrameView* CreateDefaultNonClientFrameView(
       views::Widget* widget) OVERRIDE {
     return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);
   }
   bool UseTransparentWindows() const OVERRIDE {
     // Ash uses transparent window frames.
     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);
 };
 
 }  // namespace
 
 ShellBrowserMainParts::ShellBrowserMainParts(
     const content::MainFunctionParams& parameters)
     : BrowserMainParts(),
       devtools_delegate_(NULL) {
@@ skipping 46 matching lines @@
 }
 
 ui::Clipboard* ShellBrowserMainParts::GetClipboard() {
   if (!clipboard_.get())
     clipboard_.reset(new ui::Clipboard());
   return clipboard_.get();
 }
 
 }  // namespace shell
 }  // namespace ash