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

Side by Side Diff: ui/views/win/hwnd_util_aurawin.cc

Issue 184903003: Window ownership -> WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/widget/widget_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "ui/views/win/hwnd_util.h" 5 #include "ui/views/win/hwnd_util.h"
6 6
7 #include "ui/aura/window.h" 7 #include "ui/aura/window.h"
8 #include "ui/aura/window_event_dispatcher.h" 8 #include "ui/aura/window_event_dispatcher.h"
9 #include "ui/views/widget/widget.h" 9 #include "ui/views/widget/widget.h"
10 10
11 namespace views { 11 namespace views {
12 12
13 HWND HWNDForView(const View* view) { 13 HWND HWNDForView(const View* view) {
14 return view->GetWidget() ? HWNDForWidget(view->GetWidget()) : NULL; 14 return view->GetWidget() ? HWNDForWidget(view->GetWidget()) : NULL;
15 } 15 }
16 16
17 HWND HWNDForWidget(const Widget* widget) { 17 HWND HWNDForWidget(const Widget* widget) {
18 return HWNDForNativeWindow(widget->GetNativeWindow()); 18 return HWNDForNativeWindow(widget->GetNativeWindow());
19 } 19 }
20 20
21 HWND HWNDForNativeView(const gfx::NativeView view) { 21 HWND HWNDForNativeView(const gfx::NativeView view) {
22 return view && view->GetRootWindow() ? 22 return view && view->GetRootWindow() ?
23 view->GetDispatcher()->host()->GetAcceleratedWidget() : NULL; 23 view->GetHost()->GetAcceleratedWidget() : NULL;
24 } 24 }
25 25
26 HWND HWNDForNativeWindow(const gfx::NativeWindow window) { 26 HWND HWNDForNativeWindow(const gfx::NativeWindow window) {
27 return window && window->GetRootWindow() ? 27 return window && window->GetRootWindow() ?
28 window->GetDispatcher()->host()->GetAcceleratedWidget() : NULL; 28 window->GetHost()->GetAcceleratedWidget() : NULL;
29 } 29 }
30 30
31 gfx::Rect GetWindowBoundsForClientBounds(View* view, 31 gfx::Rect GetWindowBoundsForClientBounds(View* view,
32 const gfx::Rect& client_bounds) { 32 const gfx::Rect& client_bounds) {
33 DCHECK(view); 33 DCHECK(view);
34 aura::WindowEventDispatcher* dispatcher = 34 aura::WindowTreeHost* host = view->GetWidget()->GetNativeWindow()->GetHost();
35 view->GetWidget()->GetNativeWindow()->GetDispatcher(); 35 if (host) {
36 if (dispatcher) { 36 HWND hwnd = host->GetAcceleratedWidget();
37 HWND hwnd = dispatcher->host()->GetAcceleratedWidget();
38 RECT rect = client_bounds.ToRECT(); 37 RECT rect = client_bounds.ToRECT();
39 DWORD style = ::GetWindowLong(hwnd, GWL_STYLE); 38 DWORD style = ::GetWindowLong(hwnd, GWL_STYLE);
40 DWORD ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE); 39 DWORD ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
41 AdjustWindowRectEx(&rect, style, FALSE, ex_style); 40 AdjustWindowRectEx(&rect, style, FALSE, ex_style);
42 return gfx::Rect(rect); 41 return gfx::Rect(rect);
43 } 42 }
44 return client_bounds; 43 return client_bounds;
45 } 44 }
46 45
47 } // namespace views 46 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/widget_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698