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

Unified Diff: mojo/services/window_manager/window_manager_app.h

Issue 724973003: Get event targetting working for mouse events. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: More comments, de-const a bunch of stuff in ui/. Created 6 years, 1 month 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: mojo/services/window_manager/window_manager_app.h
diff --git a/mojo/services/window_manager/window_manager_app.h b/mojo/services/window_manager/window_manager_app.h
index 96393a1c75099682adbf10e183e6c346396f191e..004442cc0640c19c0ac6b3cc288ff6f759df4680 100644
--- a/mojo/services/window_manager/window_manager_app.h
+++ b/mojo/services/window_manager/window_manager_app.h
@@ -55,9 +55,6 @@ class WindowManagerApp : public ApplicationDelegate,
WindowManagerDelegate* window_manager_delegate);
~WindowManagerApp() override;
- static View* GetViewForViewTarget(ViewTarget* view);
- ViewTarget* GetViewTargetForViewId(Id view);
-
mojo::ViewEventDispatcher* event_dispatcher() {
return view_event_dispatcher_.get();
}
@@ -93,7 +90,7 @@ class WindowManagerApp : public ApplicationDelegate,
private:
// TODO(sky): rename this. Connections is ambiguous.
typedef std::set<WindowManagerImpl*> Connections;
- typedef std::map<Id, ViewTarget*> ViewIdToViewTargetMap;
+ typedef std::set<Id> RegisteredViewIdSet;
struct PendingEmbed;
class WindowManagerInternalImpl;
@@ -102,7 +99,7 @@ class WindowManagerApp : public ApplicationDelegate,
// and adds to the registry so that it can be retrieved later via
// GetViewTargetForViewId().
// TODO(beng): perhaps View should have a property bag.
- void RegisterSubtree(View* view, ViewTarget* parent);
+ void RegisterSubtree(View* view);
// Recursively invokes Unregister() for |view| and all its descendants.
void UnregisterSubtree(View* view);
@@ -121,9 +118,6 @@ class WindowManagerApp : public ApplicationDelegate,
// Overridden from ViewObserver:
void OnTreeChanged(const ViewObserver::TreeChangeParams& params) override;
void OnViewDestroying(View* view) override;
- void OnViewBoundsChanged(View* view,
- const Rect& old_bounds,
- const Rect& new_bounds) override;
// Overridden from ui::EventHandler:
void OnEvent(ui::Event* event) override;
@@ -158,7 +152,7 @@ class WindowManagerApp : public ApplicationDelegate,
scoped_ptr<mojo::FocusController> focus_controller_;
Connections connections_;
- ViewIdToViewTargetMap view_id_to_view_target_map_;
+ RegisteredViewIdSet registered_view_id_set_;
WindowManagerInternalClientPtr window_manager_client_;
« no previous file with comments | « mojo/services/window_manager/view_targeter_unittest.cc ('k') | mojo/services/window_manager/window_manager_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698