Fix ifdef in constrained window... need to fall back to constrainedwindowframeview if not in new ...

chrome/browser/ui/views/constrained_window_views.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 29 matching lines @@
 #include "ui/views/window/frame_background.h"
 #include "ui/views/window/non_client_view.h"
 #include "ui/views/window/window_resources.h"
 #include "ui/views/window/window_shape.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "ui/views/widget/native_widget_win.h"
 #endif
 
 #if defined(USE_AURA)
+#include "base/command_line.h"
+#include "ash/ash_switches.h"
 #include "ash/shell.h"
 #endif
 
 using base::TimeDelta;
 
 namespace views {
 class ClientView;
 }
 
 // An enumeration of bitmap resources used by this window.
@@ skipping 540 matching lines @@
 
 gfx::NativeWindow ConstrainedWindowViews::GetNativeWindow() {
   return Widget::GetNativeWindow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews, views::Widget overrides:
 
 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
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews, NativeConstrainedWindowDelegate implementation:
 
 void ConstrainedWindowViews::OnNativeConstrainedWindowDestroyed() {
   wrapper_->constrained_window_tab_helper()->WillClose(this);
 }
 
 void ConstrainedWindowViews::OnNativeConstrainedWindowMouseActivate() {
   Activate();
 }
 
 views::internal::NativeWidgetDelegate*
     ConstrainedWindowViews::AsNativeWidgetDelegate() {
   return this;
 }