Fixing opacity for browser frame window on ASH/Windows.

ui/views/widget/widget.cc

Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index dc1ace9dab83349ed5e6cb1c1138078c353cae3c..25ba5bb9e13d9847def24ba1534e522a89b95ec0 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -112,9 +112,7 @@ Widget::InitParams::InitParams()
     : type(TYPE_WINDOW),
       delegate(NULL),
       child(false),
-      opacity((ViewsDelegate::views_delegate &&
-               ViewsDelegate::views_delegate->UseTransparentWindows()) ?
-              TRANSLUCENT_WINDOW : INFER_OPACITY),
+      opacity(INFER_OPACITY),
       accept_events(true),
       can_activate(true),
       keep_on_top(false),
@@ -137,10 +135,7 @@ Widget::InitParams::InitParams(Type type)
     : type(type),
       delegate(NULL),
       child(type == TYPE_CONTROL),
-      opacity(((type == TYPE_WINDOW || type == TYPE_PANEL) &&
-               ViewsDelegate::views_delegate &&
-               ViewsDelegate::views_delegate->UseTransparentWindows()) ?
-              TRANSLUCENT_WINDOW : INFER_OPACITY),
+      opacity(INFER_OPACITY),
       accept_events(true),
       can_activate(type != TYPE_POPUP && type != TYPE_MENU &&
                    type != TYPE_DRAG),
@@ -349,22 +344,18 @@ void Widget::Init(const InitParams& in_params) {
        params.type != InitParams::TYPE_CONTROL &&
        params.type != InitParams::TYPE_TOOLTIP);
   params.top_level = is_top_level_;
-  if (params.opacity == InitParams::INFER_OPACITY) {
-#if defined(OS_WIN) && defined(USE_AURA)
-    // By default, make all top-level windows but the main window transparent
-    // initially so that they can be made to fade in.
-    if (is_top_level_ && params.type != InitParams::TYPE_WINDOW)
-      params.opacity = InitParams::TRANSLUCENT_WINDOW;
-    else
-      params.opacity = InitParams::OPAQUE_WINDOW;
-#else
-    params.opacity = InitParams::OPAQUE_WINDOW;
-#endif
-  }
+
+  if (params.opacity == views::Widget::InitParams::INFER_OPACITY)

[sky, 2013/12/17 23:57:08]

nit: combine into single if.

[Shrikant Kelkar, 2013/12/18 00:05:06]

Done.

+    if (params.type != views::Widget::InitParams::TYPE_WINDOW &&
+        params.type != views::Widget::InitParams::TYPE_PANEL)
+      params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
 
   if (ViewsDelegate::views_delegate)
     ViewsDelegate::views_delegate->OnBeforeWidgetInit(&params, this);
 
+  if (params.opacity == views::Widget::InitParams::INFER_OPACITY)
+    params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
+
   widget_delegate_ = params.delegate ?
       params.delegate : new DefaultWidgetDelegate(this, params);
   ownership_ = params.ownership;