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

Unified Diff: ui/aura/window_event_dispatcher.h

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
« no previous file with comments | « ui/aura/test/ui_controls_factory_aurax11.cc ('k') | ui/aura/window_event_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_event_dispatcher.h
diff --git a/ui/aura/window_event_dispatcher.h b/ui/aura/window_event_dispatcher.h
index 213077474962b95f010c09a4a86e6fa2541ca121..c7826490e424b98a6b41359aac5bd25933fb44c2 100644
--- a/ui/aura/window_event_dispatcher.h
+++ b/ui/aura/window_event_dispatcher.h
@@ -15,7 +15,6 @@
#include "base/message_loop/message_loop.h"
#include "ui/aura/aura_export.h"
#include "ui/aura/client/capture_delegate.h"
-#include "ui/aura/window_tree_host.h"
#include "ui/base/cursor/cursor.h"
#include "ui/events/event_constants.h"
#include "ui/events/event_processor.h"
@@ -43,6 +42,7 @@ namespace aura {
class RootWindowObserver;
class TestScreen;
class WindowTargeter;
+class WindowTreeHost;
// WindowEventDispatcher orchestrates event dispatch within a window tree
// owned by WindowTreeHost. WTH also owns the WED.
@@ -55,13 +55,6 @@ class AURA_EXPORT WindowEventDispatcher : public ui::EventProcessor,
explicit WindowEventDispatcher(WindowTreeHost* host);
virtual ~WindowEventDispatcher();
- Window* window() { return host()->window(); }
- const Window* window() const { return host()->window(); }
- WindowTreeHost* host() {
- return const_cast<WindowTreeHost*>(
- const_cast<const WindowEventDispatcher*>(this)->host());
- }
- const WindowTreeHost* host() const { return host_; }
Window* mouse_pressed_handler() { return mouse_pressed_handler_; }
Window* mouse_moved_handler() { return mouse_moved_handler_; }
@@ -150,6 +143,9 @@ class AURA_EXPORT WindowEventDispatcher : public ui::EventProcessor,
// across root windows.
};
+ Window* window();
+ const Window* window() const;
+
// Updates the event with the appropriate transform for the device scale
// factor. The WindowEventDispatcher dispatches events in the physical pixel
// coordinate. But the event processing from WindowEventDispatcher onwards
« no previous file with comments | « ui/aura/test/ui_controls_factory_aurax11.cc ('k') | ui/aura/window_event_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698