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

Unified Diff: content/browser/renderer_host/compositor_resize_lock_aura.cc

Issue 196383014: Remove window/host accessors from WED; IWYU for WTH (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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/compositor_resize_lock_aura.cc
diff --git a/content/browser/renderer_host/compositor_resize_lock_aura.cc b/content/browser/renderer_host/compositor_resize_lock_aura.cc
index 0f0b53c4c6173ac8d550f9625062109408287de9..419b7b326b8a192d41a3479b2db0884f9effe50a 100644
--- a/content/browser/renderer_host/compositor_resize_lock_aura.cc
+++ b/content/browser/renderer_host/compositor_resize_lock_aura.cc
@@ -7,25 +7,26 @@
#include "base/debug/trace_event.h"
#include "content/public/browser/browser_thread.h"
#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_tree_host.h"
#include "ui/compositor/compositor.h"
namespace content {
CompositorResizeLock::CompositorResizeLock(
- aura::WindowEventDispatcher* dispatcher,
+ aura::WindowTreeHost* host,
const gfx::Size new_size,
bool defer_compositor_lock,
const base::TimeDelta& timeout)
: ResizeLock(new_size, defer_compositor_lock),
- dispatcher_(dispatcher),
+ host_(host),
weak_ptr_factory_(this),
cancelled_(false) {
- DCHECK(dispatcher_);
+ DCHECK(host_);
TRACE_EVENT_ASYNC_BEGIN2("ui", "CompositorResizeLock", this,
"width", expected_size().width(),
"height", expected_size().height());
- dispatcher_->HoldPointerMoves();
+ host_->dispatcher()->HoldPointerMoves();
BrowserThread::PostDelayedTask(
BrowserThread::UI, FROM_HERE,
@@ -52,7 +53,7 @@ void CompositorResizeLock::UnlockCompositor() {
void CompositorResizeLock::LockCompositor() {
ResizeLock::LockCompositor();
- compositor_lock_ = dispatcher_->host()->compositor()->GetCompositorLock();
+ compositor_lock_ = host_->compositor()->GetCompositorLock();
}
void CompositorResizeLock::CancelLock() {
@@ -60,7 +61,7 @@ void CompositorResizeLock::CancelLock() {
return;
cancelled_ = true;
UnlockCompositor();
- dispatcher_->ReleasePointerMoves();
+ host_->dispatcher()->ReleasePointerMoves();
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698