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

Unified Diff: mojo/services/window_manager/main.cc

Issue 636363002: Splits window manager like methods into ViewManagerServiceDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 2 trunk Created 6 years, 2 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 | « mojo/services/window_manager/BUILD.gn ('k') | mojo/services/window_manager/window_manager_app.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/window_manager/main.cc
diff --git a/mojo/services/window_manager/main.cc b/mojo/services/window_manager/main.cc
index ea0edb1e58c21a3faf18b0aadc71df8ca4aec034..3e2d37cd2fd9e0c05ff7e2f8357ece6e41724315 100644
--- a/mojo/services/window_manager/main.cc
+++ b/mojo/services/window_manager/main.cc
@@ -9,8 +9,8 @@
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/public/cpp/view_manager/view_manager.h"
#include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
-#include "mojo/services/public/cpp/view_manager/window_manager_delegate.h"
#include "mojo/services/window_manager/window_manager_app.h"
+#include "mojo/services/window_manager/window_manager_delegate.h"
// ApplicationDelegate implementation file for WindowManager users (e.g.
// core window manager tests) that do not want to provide their own
@@ -46,7 +46,6 @@ class DefaultWindowManager : public ApplicationDelegate,
scoped_ptr<ServiceProvider> imported_services) override {
view_manager_ = view_manager;
root_ = root;
- view_manager_->SetWindowManagerDelegate(this);
}
virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {}
@@ -59,7 +58,6 @@ class DefaultWindowManager : public ApplicationDelegate,
view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>(
new mojo::ServiceProviderImpl).Pass());
}
- virtual void DispatchEvent(EventPtr event) override {}
scoped_ptr<WindowManagerApp> window_manager_app_;
« no previous file with comments | « mojo/services/window_manager/BUILD.gn ('k') | mojo/services/window_manager/window_manager_app.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698