Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(494)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc

Issue 1162883003: Fix Z-order for a bubble when it appears for inactive window. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix CrOS Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 void DesktopWindowTreeHostWin::SetSize(const gfx::Size& size) { 224 void DesktopWindowTreeHostWin::SetSize(const gfx::Size& size) {
224 gfx::Size size_in_pixels = gfx::win::DIPToScreenSize(size); 225 gfx::Size size_in_pixels = gfx::win::DIPToScreenSize(size);
225 gfx::Size expanded = GetExpandedWindowSize( 226 gfx::Size expanded = GetExpandedWindowSize(
226 message_handler_->window_ex_style(), size_in_pixels); 227 message_handler_->window_ex_style(), size_in_pixels);
227 window_enlargement_ = 228 window_enlargement_ =
228 gfx::Vector2d(expanded.width() - size_in_pixels.width(), 229 gfx::Vector2d(expanded.width() - size_in_pixels.width(),
229 expanded.height() - size_in_pixels.height()); 230 expanded.height() - size_in_pixels.height());
230 message_handler_->SetSize(expanded); 231 message_handler_->SetSize(expanded);
231 } 232 }
232 233
234 void DesktopWindowTreeHostWin::StackAbove(aura::Window* window) {
235 HWND hwnd = HWNDForNativeView(window);
236 if (hwnd)
237 message_handler_->StackAbove(hwnd);
238 }
239
233 void DesktopWindowTreeHostWin::StackAtTop() { 240 void DesktopWindowTreeHostWin::StackAtTop() {
234 message_handler_->StackAtTop(); 241 message_handler_->StackAtTop();
235 } 242 }
236 243
237 void DesktopWindowTreeHostWin::CenterWindow(const gfx::Size& size) { 244 void DesktopWindowTreeHostWin::CenterWindow(const gfx::Size& size) {
238 gfx::Size size_in_pixels = gfx::win::DIPToScreenSize(size); 245 gfx::Size size_in_pixels = gfx::win::DIPToScreenSize(size);
239 gfx::Size expanded_size; 246 gfx::Size expanded_size;
240 expanded_size = GetExpandedWindowSize(message_handler_->window_ex_style(), 247 expanded_size = GetExpandedWindowSize(message_handler_->window_ex_style(),
241 size_in_pixels); 248 size_in_pixels);
242 window_enlargement_ = 249 window_enlargement_ =
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
955 962
956 // static 963 // static
957 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( 964 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
958 internal::NativeWidgetDelegate* native_widget_delegate, 965 internal::NativeWidgetDelegate* native_widget_delegate,
959 DesktopNativeWidgetAura* desktop_native_widget_aura) { 966 DesktopNativeWidgetAura* desktop_native_widget_aura) {
960 return new DesktopWindowTreeHostWin(native_widget_delegate, 967 return new DesktopWindowTreeHostWin(native_widget_delegate,
961 desktop_native_widget_aura); 968 desktop_native_widget_aura);
962 } 969 }
963 970
964 } // namespace views 971 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698