Index: apps/ui/views/native_app_window_views.cc |
diff --git a/apps/ui/views/native_app_window_views.cc b/apps/ui/views/native_app_window_views.cc |
index 62b941d9e58db4628f080934c6bf49b1660b76a8..8d97c4a5d1c2c772050d07a1aa8a4d48d141cf1e 100644 |
--- a/apps/ui/views/native_app_window_views.cc |
+++ b/apps/ui/views/native_app_window_views.cc |
@@ -27,14 +27,12 @@ NativeAppWindowViews::NativeAppWindowViews() |
web_view_(NULL), |
widget_(NULL), |
frameless_(false), |
- transparent_background_(false), |
resizable_(false) {} |
void NativeAppWindowViews::Init(AppWindow* app_window, |
const AppWindow::CreateParams& create_params) { |
app_window_ = app_window; |
frameless_ = create_params.frame == AppWindow::FRAME_NONE; |
- transparent_background_ = create_params.transparent_background; |
resizable_ = create_params.resizable; |
size_constraints_.set_minimum_size( |
create_params.GetContentMinimumSize(gfx::Insets())); |
@@ -260,7 +258,8 @@ void NativeAppWindowViews::OnWidgetActivationChanged(views::Widget* widget, |
void NativeAppWindowViews::RenderViewCreated( |
content::RenderViewHost* render_view_host) { |
- if (transparent_background_) { |
+ if (app_window_->requested_transparent_background() && |
+ CanHaveAlphaEnabled()) { |
content::RenderWidgetHostView* view = render_view_host->GetView(); |
DCHECK(view); |
view->SetBackgroundOpaque(false); |
@@ -398,4 +397,12 @@ void NativeAppWindowViews::SetContentSizeConstraints( |
size_constraints_.set_maximum_size(max_size); |
} |
+bool NativeAppWindowViews::CanHaveAlphaEnabled() const { |
+ return widget_->CanHaveAlphaEnabled(); |
+} |
+ |
+void NativeAppWindowViews::OnCanHaveAlphaEnabledChanged() { |
tapted
2014/07/16 03:01:01
nit: follow header declaration order - this should
jackhou1
2014/07/16 05:54:04
Done.
|
+ app_window_->OnNativeWindowChanged(); |
+} |
+ |
} // namespace apps |