| 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
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|