OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/chrome_views_delegate.h" | 5 #include "chrome/browser/ui/views/chrome_views_delegate.h" |
6 | 6 |
7 #include "chrome/browser/ui/ash/ash_util.h" | 7 #include "chrome/browser/ui/ash/ash_util.h" |
8 | 8 |
9 views::Widget::InitParams::WindowOpacity | 9 views::Widget::InitParams::WindowOpacity |
10 ChromeViewsDelegate::GetOpacityForInitParams( | 10 ChromeViewsDelegate::GetOpacityForInitParams( |
11 const views::Widget::InitParams& params) { | 11 const views::Widget::InitParams& params) { |
12 #if defined(USE_ASH) | 12 #if defined(USE_ASH) |
13 gfx::NativeView native_view = params.parent ? params.parent : params.context; | 13 gfx::NativeView native_view = params.parent ? params.parent : params.context; |
14 if (native_view && chrome::IsNativeViewInAsh(native_view)) | 14 if (native_view && chrome::IsNativeViewInAsh(native_view)) |
15 return views::Widget::InitParams::TRANSLUCENT_WINDOW; | 15 return views::Widget::InitParams::TRANSLUCENT_WINDOW; |
16 #endif | 16 #endif |
17 // We want translucent windows when either we are in ASH or we are | 17 // We want translucent windows when either we are in ASH or we are |
18 // a top level window which is not of type TYPE_WINDOW. | 18 // a top level window which is not of type TYPE_WINDOW. |
19 if (params.top_level && params.type != views::Widget::InitParams::TYPE_WINDOW) | 19 if (!params.child && params.type != views::Widget::InitParams::TYPE_WINDOW) |
20 return views::Widget::InitParams::TRANSLUCENT_WINDOW; | 20 return views::Widget::InitParams::TRANSLUCENT_WINDOW; |
21 | 21 |
22 return views::Widget::InitParams::OPAQUE_WINDOW; | 22 return views::Widget::InitParams::OPAQUE_WINDOW; |
23 } | 23 } |
OLD | NEW |