OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "ui/aura/client/activation_client.h" | 9 #include "ui/aura/client/activation_client.h" |
10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
(...skipping 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1150 DCHECK(!input_method_event_filter_.get()); | 1150 DCHECK(!input_method_event_filter_.get()); |
1151 | 1151 |
1152 input_method_event_filter_.reset(new corewm::InputMethodEventFilter( | 1152 input_method_event_filter_.reset(new corewm::InputMethodEventFilter( |
1153 root_window_->host()->GetAcceleratedWidget())); | 1153 root_window_->host()->GetAcceleratedWidget())); |
1154 input_method_event_filter_->SetInputMethodPropertyInRootWindow( | 1154 input_method_event_filter_->SetInputMethodPropertyInRootWindow( |
1155 root_window_->window()); | 1155 root_window_->window()); |
1156 root_window_event_filter_->AddHandler(input_method_event_filter_.get()); | 1156 root_window_event_filter_->AddHandler(input_method_event_filter_.get()); |
1157 } | 1157 } |
1158 | 1158 |
1159 void DesktopNativeWidgetAura::UpdateWindowTransparency() { | 1159 void DesktopNativeWidgetAura::UpdateWindowTransparency() { |
1160 content_window_->SetTransparent(ShouldUseNativeFrame()); | 1160 bool transparent = false; |
1161 #if defined(OS_WIN) | |
1162 // On Windows, a native frame implies Glass, so the window should be | |
1163 // transparent. | |
1164 transparent = ShouldUseNativeFrame(); | |
sky
2014/02/03 21:53:03
Add a method to DesktopRootWindow that determines
Matt Giuca
2014/02/05 23:25:31
Done.
sky
2014/02/06 00:36:14
This isn't quite what I was asking for. I'm saying
Matt Giuca
2014/02/07 09:13:11
Done.
| |
1165 #endif | |
1166 content_window_->SetTransparent(transparent); | |
1161 } | 1167 } |
1162 | 1168 |
1163 } // namespace views | 1169 } // namespace views |
OLD | NEW |