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

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_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_non_client_frame_view_factory_aura.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc (revision 156649)
+++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc (working copy)
@@ -4,11 +4,13 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "base/command_line.h"
+#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
+#include "ui/views/views_switches.h"
+
#if defined(USE_ASH)
#include "chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h"
#include "chrome/browser/ui/views/frame/app_non_client_frame_view_aura.h"
-#else
-#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
#endif
namespace chrome {
@@ -16,6 +18,10 @@
BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
BrowserFrame* frame, BrowserView* browser_view) {
+#if defined(USE_AURA)
+ if (CommandLine::ForCurrentProcess()->HasSwitch(views::switches::kWinAura))
+ return new OpaqueBrowserFrameView(frame, browser_view);
+#endif
#if defined(USE_ASH)
// If this is an app window and it's maximized, use the special frame_view.
if (browser_view->browser()->is_app() &&
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_aura.cc ('k') | chrome/browser/ui/views/frame/desktop_browser_frame_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698