Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7105)

Unified Diff: chrome/browser/ui/views/frame/browser_frame_aura.cc

Issue 10913237: Allow the Views Delegate to provide the native widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_frame_aura.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_frame_aura.cc (revision 156649)
+++ chrome/browser/ui/views/frame/browser_frame_aura.cc (working copy)
@@ -4,6 +4,7 @@
#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/system_menu_model_delegate.h"
@@ -19,11 +20,16 @@
#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"
#endif
+#if !defined(OS_CHROMEOS)
+#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
+#endif
+
using aura::Window;
////////////////////////////////////////////////////////////////////////////////
@@ -187,6 +193,10 @@
NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
BrowserFrame* browser_frame,
BrowserView* browser_view) {
+#if !defined(OS_CHROMEOS)
+ if (CommandLine::ForCurrentProcess()->HasSwitch(views::switches::kWinAura))
+ return new DesktopBrowserFrameAura(browser_frame, browser_view);
+#endif
return new BrowserFrameAura(browser_frame, browser_view);
}

Powered by Google App Engine
This is Rietveld 408576698