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 157 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/17 19:14:23]

nit: remove 'would'.

[Shrikant Kelkar, 2013/12/17 22:43:34]

Done.

+  if (params->opacity == views::Widget::InitParams::INFER_OPACITY)
+    params->opacity = GetOpacityForInitParams(*params);
+
   // 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();
 }
+
+#if !defined(USE_AURA) && !defined(USE_CHROMEOS)
+views::Widget::InitParams::WindowOpacity
+ChromeViewsDelegate::GetOpacityForInitParams(
+    const views::Widget::InitParams& params) {
+  return views::Widget::InitParams::OPAQUE_WINDOW;
+}
+#endif