| Index: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
|
| diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
|
| index 41c62ea0509f9dab78072ed008e46ddff45110eb..699876a40f87fc5321427e89f6b155b273188b27 100644
|
| --- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
|
| +++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
|
| @@ -17,7 +17,6 @@
|
| #include "mojo/services/public/cpp/view_manager/util.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"
|
|
|
| namespace mojo {
|
|
|
| @@ -93,11 +92,7 @@ class RootObserver : public ViewObserver {
|
|
|
| ViewManagerClientImpl::ViewManagerClientImpl(ViewManagerDelegate* delegate,
|
| Shell* shell)
|
| - : connected_(false),
|
| - connection_id_(0),
|
| - next_id_(1),
|
| - delegate_(delegate),
|
| - window_manager_delegate_(NULL) {
|
| + : connected_(false), connection_id_(0), next_id_(1), delegate_(delegate) {
|
| // TODO(beng): Come up with a better way of establishing a configuration for
|
| // what the active window manager is.
|
| std::string window_manager_url = "mojo:mojo_window_manager";
|
| @@ -220,18 +215,6 @@ void ViewManagerClientImpl::RemoveView(Id view_id) {
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // ViewManagerClientImpl, ViewManager implementation:
|
|
|
| -void ViewManagerClientImpl::SetWindowManagerDelegate(
|
| - WindowManagerDelegate* window_manager_delegate) {
|
| - CHECK(NULL != GetViewById(1));
|
| - CHECK(!window_manager_delegate_);
|
| - window_manager_delegate_ = window_manager_delegate;
|
| -}
|
| -
|
| -void ViewManagerClientImpl::DispatchEvent(View* target, EventPtr event) {
|
| - CHECK(window_manager_delegate_);
|
| - service_->DispatchOnViewInputEvent(target->id(), event.Pass());
|
| -}
|
| -
|
| const std::string& ViewManagerClientImpl::GetEmbedderURL() const {
|
| return creator_url_;
|
| }
|
| @@ -353,18 +336,6 @@ void ViewManagerClientImpl::OnViewInputEvent(
|
| ack_callback.Run();
|
| }
|
|
|
| -void ViewManagerClientImpl::Embed(
|
| - const String& url,
|
| - InterfaceRequest<ServiceProvider> service_provider) {
|
| - if (window_manager_delegate_)
|
| - window_manager_delegate_->Embed(url, service_provider.Pass());
|
| -}
|
| -
|
| -void ViewManagerClientImpl::DispatchOnViewInputEvent(EventPtr event) {
|
| - if (window_manager_delegate_)
|
| - window_manager_delegate_->DispatchEvent(event.Pass());
|
| -}
|
| -
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // ViewManagerClientImpl, WindowManagerClient2 implementation:
|
|
|
|
|