Allow the Views Delegate to provide the native widget.

chrome/browser/ui/views/frame/browser_frame_aura.cc

Index: chrome/browser/ui/views/frame/browser_frame_aura.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_frame_aura.cc	(revision 156552)
+++ chrome/browser/ui/views/frame/browser_frame_aura.cc	(working copy)
@@ -4,8 +4,10 @@
 
 #include "chrome/browser/ui/views/frame/browser_frame_aura.h"
 
+#include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -19,6 +21,7 @@
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/view.h"
+#include "ui/views/views_switches.h"
 
 #if defined(USE_ASH)
 #include "ash/wm/property_util.h"
@@ -187,6 +190,8 @@
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(views::switches::kWinAura))
+    return new DesktopBrowserFrameAura(browser_frame, browser_view);
   return new BrowserFrameAura(browser_frame, browser_view);
 }