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

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

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.cc
===================================================================
--- trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc (revision 284322)
+++ trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc (working copy)
@@ -13,9 +13,9 @@
#include "mojo/services/public/cpp/view_manager/lib/view_private.h"
#include "mojo/services/public/cpp/view_manager/node_observer.h"
#include "mojo/services/public/cpp/view_manager/util.h"
+#include "mojo/services/public/cpp/view_manager/view_event_dispatcher.h"
#include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
#include "mojo/services/public/cpp/view_manager/view_observer.h"
-#include "mojo/services/public/cpp/view_manager/window_manager_delegate.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/codec/png_codec.h"
@@ -529,7 +529,7 @@
connection_id_(0),
next_id_(1),
delegate_(delegate),
- window_manager_delegate_(NULL) {}
+ dispatcher_(NULL) {}
ViewManagerClientImpl::~ViewManagerClientImpl() {
while (!nodes_.empty()) {
@@ -676,14 +676,14 @@
////////////////////////////////////////////////////////////////////////////////
// ViewManagerClientImpl, ViewManager implementation:
-void ViewManagerClientImpl::SetWindowManagerDelegate(
- WindowManagerDelegate* window_manager_delegate) {
+void ViewManagerClientImpl::SetEventDispatcher(
+ ViewEventDispatcher* dispatcher) {
CHECK(NULL != GetNodeById(1));
- window_manager_delegate_ = window_manager_delegate;
+ dispatcher_ = dispatcher;
}
void ViewManagerClientImpl::DispatchEvent(View* target, EventPtr event) {
- CHECK(window_manager_delegate_);
+ CHECK(dispatcher_);
service_->DispatchOnViewInputEvent(target->id(), event.Pass());
}
@@ -824,13 +824,9 @@
}
}
-void ViewManagerClientImpl::EmbedRoot(const String& url) {
- window_manager_delegate_->EmbedRoot(url);
-}
-
void ViewManagerClientImpl::DispatchOnViewInputEvent(Id view_id,
EventPtr event) {
- window_manager_delegate_->DispatchEvent(GetViewById(view_id), event.Pass());
+ dispatcher_->DispatchEvent(GetViewById(view_id), event.Pass());
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698