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

Unified Diff: trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h

Issue 405803002: Revert 284322 "Allow EmbedRoot to be called multiple times." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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: trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
===================================================================
--- trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h (revision 284322)
+++ trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h (working copy)
@@ -21,6 +21,7 @@
class ApplicationConnection;
namespace view_manager {
+class ViewEventDispatcher;
class ViewManager;
class ViewManagerTransaction;
@@ -87,8 +88,7 @@
typedef std::map<Id, View*> IdToViewMap;
// Overridden from ViewManager:
- virtual void SetWindowManagerDelegate(
- WindowManagerDelegate* delegate) OVERRIDE;
+ virtual void SetEventDispatcher(ViewEventDispatcher* dispatcher) OVERRIDE;
virtual void DispatchEvent(View* target, EventPtr event) OVERRIDE;
virtual const std::string& GetEmbedderURL() const OVERRIDE;
virtual const std::vector<Node*>& GetRoots() const OVERRIDE;
@@ -123,7 +123,6 @@
EventPtr event,
const Callback<void()>& callback) OVERRIDE;
virtual void OnFocusChanged(Id gained_focus_id, Id lost_focus_id) OVERRIDE;
- virtual void EmbedRoot(const String& url) OVERRIDE;
virtual void DispatchOnViewInputEvent(Id view_id, EventPtr event) OVERRIDE;
// Sync the client model with the service by enumerating the pending
@@ -148,7 +147,7 @@
base::Callback<void(void)> changes_acked_callback_;
ViewManagerDelegate* delegate_;
- WindowManagerDelegate* window_manager_delegate_;
+ ViewEventDispatcher* dispatcher_;
std::vector<Node*> roots_;
« no previous file with comments | « trunk/src/mojo/mojo_services.gypi ('k') | trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698