Allow the Views Delegate to provide the native widget.

chrome/browser/ui/views/chrome_views_delegate.cc

Index: chrome/browser/ui/views/chrome_views_delegate.cc
===================================================================
--- chrome/browser/ui/views/chrome_views_delegate.cc	(revision 156649)
+++ chrome/browser/ui/views/chrome_views_delegate.cc	(working copy)
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 
+#include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ -16,6 +17,7 @@
 #include "chrome/common/pref_names.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/views_switches.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/widget.h"
 
@@ -23,6 +25,10 @@
 #include "chrome/browser/app_icon_win.h"
 #endif
 
+#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#include "ui/views/widget/desktop_native_widget_aura.h"
+#endif
+
 #if defined(USE_AURA)
 #include "ui/views/widget/desktop_native_widget_helper_aura.h"
 #endif
@@ -177,3 +183,13 @@
     content::SiteInstance* site_instance) {
   return NULL;
 }
+
+views::NativeWidget* ChromeViewsDelegate::CreateNativeWidget(
+    views::internal::NativeWidgetDelegate* delegate,
+    gfx::NativeView parent) {
+#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+  if (CommandLine::ForCurrentProcess()->HasSwitch(views::switches::kWinAura))
+    return new views::DesktopNativeWidgetAura(delegate);
+#endif
+  return NULL;
+}