summaryrefslogtreecommitdiffstats
path: root/chromium/ui/views/win/hwnd_util_aurawin.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ui/views/win/hwnd_util_aurawin.cc')
-rw-r--r--chromium/ui/views/win/hwnd_util_aurawin.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/chromium/ui/views/win/hwnd_util_aurawin.cc b/chromium/ui/views/win/hwnd_util_aurawin.cc
index 9fc6f10d816..37dca58f774 100644
--- a/chromium/ui/views/win/hwnd_util_aurawin.cc
+++ b/chromium/ui/views/win/hwnd_util_aurawin.cc
@@ -4,8 +4,8 @@
#include "ui/views/win/hwnd_util.h"
-#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
#include "ui/views/widget/widget.h"
namespace views {
@@ -20,21 +20,20 @@ HWND HWNDForWidget(const Widget* widget) {
HWND HWNDForNativeView(const gfx::NativeView view) {
return view && view->GetRootWindow() ?
- view->GetDispatcher()->host()->GetAcceleratedWidget() : NULL;
+ view->GetHost()->GetAcceleratedWidget() : NULL;
}
HWND HWNDForNativeWindow(const gfx::NativeWindow window) {
return window && window->GetRootWindow() ?
- window->GetDispatcher()->host()->GetAcceleratedWidget() : NULL;
+ window->GetHost()->GetAcceleratedWidget() : NULL;
}
gfx::Rect GetWindowBoundsForClientBounds(View* view,
const gfx::Rect& client_bounds) {
DCHECK(view);
- aura::WindowEventDispatcher* dispatcher =
- view->GetWidget()->GetNativeWindow()->GetDispatcher();
- if (dispatcher) {
- HWND hwnd = dispatcher->host()->GetAcceleratedWidget();
+ aura::WindowTreeHost* host = view->GetWidget()->GetNativeWindow()->GetHost();
+ if (host) {
+ HWND hwnd = host->GetAcceleratedWidget();
RECT rect = client_bounds.ToRECT();
DWORD style = ::GetWindowLong(hwnd, GWL_STYLE);
DWORD ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);