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_window_tree_host_win.h" | 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" |
6 | 6 |
7 #include "base/win/metro.h" | 7 #include "base/win/metro.h" |
8 #include "third_party/skia/include/core/SkPath.h" | 8 #include "third_party/skia/include/core/SkPath.h" |
9 #include "third_party/skia/include/core/SkRegion.h" | 9 #include "third_party/skia/include/core/SkRegion.h" |
10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "ui/views/ime/input_method_bridge.h" | 29 #include "ui/views/ime/input_method_bridge.h" |
30 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h" | 30 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h" |
31 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h" | 31 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h" |
32 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" | 32 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" |
33 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 33 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
34 #include "ui/views/widget/root_view.h" | 34 #include "ui/views/widget/root_view.h" |
35 #include "ui/views/widget/widget_delegate.h" | 35 #include "ui/views/widget/widget_delegate.h" |
36 #include "ui/views/widget/widget_hwnd_utils.h" | 36 #include "ui/views/widget/widget_hwnd_utils.h" |
37 #include "ui/views/win/fullscreen_handler.h" | 37 #include "ui/views/win/fullscreen_handler.h" |
38 #include "ui/views/win/hwnd_message_handler.h" | 38 #include "ui/views/win/hwnd_message_handler.h" |
| 39 #include "ui/views/win/hwnd_util.h" |
39 #include "ui/wm/core/compound_event_filter.h" | 40 #include "ui/wm/core/compound_event_filter.h" |
40 #include "ui/wm/core/input_method_event_filter.h" | 41 #include "ui/wm/core/input_method_event_filter.h" |
41 #include "ui/wm/core/window_animations.h" | 42 #include "ui/wm/core/window_animations.h" |
42 #include "ui/wm/public/scoped_tooltip_disabler.h" | 43 #include "ui/wm/public/scoped_tooltip_disabler.h" |
43 | 44 |
44 DECLARE_WINDOW_PROPERTY_TYPE(views::DesktopWindowTreeHostWin*); | 45 DECLARE_WINDOW_PROPERTY_TYPE(views::DesktopWindowTreeHostWin*); |
45 | 46 |
46 namespace views { | 47 namespace views { |
47 | 48 |
48 namespace { | 49 namespace { |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 void DesktopWindowTreeHostWin::SetSize(const gfx::Size& size) { | 228 void DesktopWindowTreeHostWin::SetSize(const gfx::Size& size) { |
228 gfx::Size size_in_pixels = gfx::win::DIPToScreenSize(size); | 229 gfx::Size size_in_pixels = gfx::win::DIPToScreenSize(size); |
229 gfx::Size expanded = GetExpandedWindowSize( | 230 gfx::Size expanded = GetExpandedWindowSize( |
230 message_handler_->window_ex_style(), size_in_pixels); | 231 message_handler_->window_ex_style(), size_in_pixels); |
231 window_enlargement_ = | 232 window_enlargement_ = |
232 gfx::Vector2d(expanded.width() - size_in_pixels.width(), | 233 gfx::Vector2d(expanded.width() - size_in_pixels.width(), |
233 expanded.height() - size_in_pixels.height()); | 234 expanded.height() - size_in_pixels.height()); |
234 message_handler_->SetSize(expanded); | 235 message_handler_->SetSize(expanded); |
235 } | 236 } |
236 | 237 |
| 238 void DesktopWindowTreeHostWin::StackAbove(aura::Window* window) { |
| 239 HWND hwnd = HWNDForNativeView(window); |
| 240 if (hwnd) |
| 241 message_handler_->StackAbove(hwnd); |
| 242 } |
| 243 |
237 void DesktopWindowTreeHostWin::StackAtTop() { | 244 void DesktopWindowTreeHostWin::StackAtTop() { |
238 message_handler_->StackAtTop(); | 245 message_handler_->StackAtTop(); |
239 } | 246 } |
240 | 247 |
241 void DesktopWindowTreeHostWin::CenterWindow(const gfx::Size& size) { | 248 void DesktopWindowTreeHostWin::CenterWindow(const gfx::Size& size) { |
242 gfx::Size size_in_pixels = gfx::win::DIPToScreenSize(size); | 249 gfx::Size size_in_pixels = gfx::win::DIPToScreenSize(size); |
243 gfx::Size expanded_size; | 250 gfx::Size expanded_size; |
244 expanded_size = GetExpandedWindowSize(message_handler_->window_ex_style(), | 251 expanded_size = GetExpandedWindowSize(message_handler_->window_ex_style(), |
245 size_in_pixels); | 252 size_in_pixels); |
246 window_enlargement_ = | 253 window_enlargement_ = |
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
958 | 965 |
959 // static | 966 // static |
960 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( | 967 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( |
961 internal::NativeWidgetDelegate* native_widget_delegate, | 968 internal::NativeWidgetDelegate* native_widget_delegate, |
962 DesktopNativeWidgetAura* desktop_native_widget_aura) { | 969 DesktopNativeWidgetAura* desktop_native_widget_aura) { |
963 return new DesktopWindowTreeHostWin(native_widget_delegate, | 970 return new DesktopWindowTreeHostWin(native_widget_delegate, |
964 desktop_native_widget_aura); | 971 desktop_native_widget_aura); |
965 } | 972 } |
966 | 973 |
967 } // namespace views | 974 } // namespace views |
OLD | NEW |