Fixing opacity for browser frame window on ASH/Windows.

chrome/browser/ui/views/chrome_views_delegate.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/chrome_views_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
@@ skipping 156 matching lines @@
 
 views::NonClientFrameView* ChromeViewsDelegate::CreateDefaultNonClientFrameView(
     views::Widget* widget) {
 #if defined(USE_ASH)
   if (chrome::IsNativeViewInAsh(widget->GetNativeView()))
     return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);
 #endif
   return NULL;
 }
 
-bool ChromeViewsDelegate::UseTransparentWindows() const {
-#if defined(USE_ASH)
-  // TODO(scottmg): http://crbug.com/133312. This needs context to determine
-  // if it's desktop or ash.
-#if defined(OS_CHROMEOS)
-  return true;
-#else
-  NOTIMPLEMENTED();
-  return false;
-#endif
-#else
-  return false;
-#endif
-}
-
 void ChromeViewsDelegate::AddRef() {
   g_browser_process->AddRefModule();
 }
 
 void ChromeViewsDelegate::ReleaseRef() {
   g_browser_process->ReleaseModule();
 }
 
 content::WebContents* ChromeViewsDelegate::CreateWebContents(
     content::BrowserContext* browser_context,
     content::SiteInstance* site_instance) {
   return NULL;
 }
 
 void ChromeViewsDelegate::OnBeforeWidgetInit(
     views::Widget::InitParams* params,
     views::internal::NativeWidgetDelegate* delegate) {
+  // We would need to determine opacity if it's not already specified.

[sky, 2013/12/12 23:58:14]

You're making a method that is already unreadable even more so. Here's what you
should do:

Create function called GetOpacityForNewlyCreatedWindows().
. chrome_views_delegate_chromeos.cc: GetOpacityForNewlyCreatedWindows always
returns TRANSLUCENT
. chrome_views_delegate_aura: if starting on 205 in
GetOpacityForNewlyCreatedWindows (it isn't specific to windows).
. and in this file you'll have GetOpacityForNewlyCreatedWindows definition, but
only if !aura and !chromeos.

[Shrikant Kelkar, 2013/12/17 07:06:21]

Done.

+  if (params->opacity == views::Widget::InitParams::INFER_OPACITY) {
+    if (params->type != views::Widget::InitParams::TYPE_WINDOW &&
+        params->type != views::Widget::InitParams::TYPE_PANEL) {
+      // All other windows except TYPE_WINDOW AND TYPE_PANEL should be
+      // opaque.
+      params->opacity = views::Widget::InitParams::OPAQUE_WINDOW;
+    } else {
+#if defined(USE_ASH) && defined(OS_CHROMEOS)
+      // For ChromeOS we always want transparent windows.
+      params->opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
+#elif defined(OS_WIN) && defined(USE_AURA)
+      // We want translucent windows when either we are in ASH or we are
+      // a top level window which is not of type TYPE_WINDOW.
+      if (chrome::IsNativeViewInAsh(params->context) ||
+          (params->top_level && params->type !=
+              views::Widget::InitParams::TYPE_WINDOW))
+        params->opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
+      else
+        params->opacity = views::Widget::InitParams::OPAQUE_WINDOW;
+#else
+      // For everything else we want opaque windows.
+      params->opacity = views::Widget::InitParams::OPAQUE_WINDOW;
+#endif
+    }
+  }
+
   // If we already have a native_widget, we don't have to try to come
   // up with one.
   if (params->native_widget)
     return;
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
   bool use_non_toplevel_window =
       params->parent && params->type != views::Widget::InitParams::TYPE_MENU;
 
 #if defined(OS_WIN)
@@ skipping 84 matching lines @@
       params->native_widget = new views::DesktopNativeWidgetAura(delegate);
     }
   }
 #endif
 }
 
 base::TimeDelta
 ChromeViewsDelegate::GetDefaultTextfieldObscuredRevealDuration() {
   return base::TimeDelta();
 }