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

Unified Diff: chrome/browser/ui/views/constrained_window_views.cc

Issue 9114067: Fix ifdef in constrained window... need to fall back to constrainedwindowframeview if not in new ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/constrained_window_views.cc
===================================================================
--- chrome/browser/ui/views/constrained_window_views.cc (revision 117170)
+++ chrome/browser/ui/views/constrained_window_views.cc (working copy)
@@ -47,6 +47,8 @@
#endif
#if defined(USE_AURA)
+#include "base/command_line.h"
+#include "ash/ash_switches.h"
#include "ash/shell.h"
#endif
@@ -607,10 +609,12 @@
views::NonClientFrameView* ConstrainedWindowViews::CreateNonClientFrameView() {
#if defined(USE_AURA)
- return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(this);
-#else
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ ash::switches::kAuraGoogleDialogFrames)) {
+ return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(this);
+ }
+#endif
return new ConstrainedWindowFrameView(this);
-#endif
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698