Ash: Use translucent frames by default

chrome/browser/ui/views/constrained_window_views.cc

 // Copyright (c) 2012 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 548 matching lines @@
     TabContentsWrapper* wrapper,
     views::WidgetDelegate* widget_delegate)
     : wrapper_(wrapper),
       ALLOW_THIS_IN_INITIALIZER_LIST(native_constrained_window_(
           NativeConstrainedWindow::CreateNativeConstrainedWindow(this))) {
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.delegate = widget_delegate;
   params.native_widget = native_constrained_window_->AsNativeWidget();
   params.child = true;
   params.parent = wrapper->web_contents()->GetNativeView();
+#if defined(USE_AURA)
+  // In non-compact mode the window header can be transparent.
+  if (!ash::Shell::GetInstance()->IsWindowModeCompact())
+    params.transparent = true;
+#endif
   Init(params);
 
   wrapper_->constrained_window_tab_helper()->AddConstrainedDialog(this);
 }
 
 ConstrainedWindowViews::~ConstrainedWindowViews() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews, ConstrainedWindow implementation:
@@ skipping 26 matching lines @@
 gfx::NativeWindow ConstrainedWindowViews::GetNativeWindow() {
   return Widget::GetNativeWindow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews, views::Widget overrides:
 
 views::NonClientFrameView* ConstrainedWindowViews::CreateNonClientFrameView() {
 #if defined(USE_AURA)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(ash::switches::kAuraGoogleDialogFrames) ||
-      command_line->HasSwitch(ash::switches::kAuraTranslucentFrames)) {
+  if (command_line->HasSwitch(ash::switches::kAuraGoogleDialogFrames))
     return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(this);
-  }
+  // In non-compact mode use fancy translucent headers.
+  if (!ash::Shell::GetInstance()->IsWindowModeCompact())
+    return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(this);
 #endif
   return new ConstrainedWindowFrameView(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews, NativeConstrainedWindowDelegate implementation:
 
 void ConstrainedWindowViews::OnNativeConstrainedWindowDestroyed() {
   wrapper_->constrained_window_tab_helper()->WillClose(this);
 }
 
 void ConstrainedWindowViews::OnNativeConstrainedWindowMouseActivate() {
   Activate();
 }
 
 views::internal::NativeWidgetDelegate*
     ConstrainedWindowViews::AsNativeWidgetDelegate() {
   return this;
 }