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

Unified Diff: components/view_manager/connection_manager.cc

Issue 1138073007: Nukes the windowmanager interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 7 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 | « components/view_manager/connection_manager.h ('k') | components/view_manager/event_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/view_manager/connection_manager.cc
diff --git a/components/view_manager/connection_manager.cc b/components/view_manager/connection_manager.cc
index ae88b1a524deaec2b980b3cd5f87c689ab5fa672..2677236e0780e5e0259e276c1f5c082d0bf8d3f4 100644
--- a/components/view_manager/connection_manager.cc
+++ b/components/view_manager/connection_manager.cc
@@ -111,14 +111,12 @@ ConnectionManager::ScopedChange::~ScopedChange() {
}
ConnectionManager::ConnectionManager(ConnectionManagerDelegate* delegate,
- scoped_ptr<DisplayManager> display_manager,
- mojo::WindowManagerInternal* wm_internal)
+ scoped_ptr<DisplayManager> display_manager)
: delegate_(delegate),
window_manager_client_connection_(nullptr),
next_connection_id_(1),
display_manager_(display_manager.Pass()),
root_(CreateServerView(RootViewId())),
- wm_internal_(wm_internal),
current_change_(nullptr),
in_destructor_(false),
animation_runner_(base::TimeTicks::Now()),
@@ -525,22 +523,13 @@ void ConnectionManager::OnViewSharedPropertyChanged(
}
}
-void ConnectionManager::SetViewportSize(mojo::SizePtr size) {
- display_manager_->SetViewportSize(size.To<gfx::Size>());
+void ConnectionManager::SetViewManagerRootClient(
+ mojo::ViewManagerRootClientPtr client) {
+ view_manager_root_client_ = client.Pass();
}
-void ConnectionManager::DispatchInputEventToViewDEPRECATED(
- mojo::Id transport_view_id,
- mojo::EventPtr event) {
- const ViewId view_id(ViewIdFromTransportId(transport_view_id));
-
- ViewManagerServiceImpl* connection = GetConnectionWithRoot(view_id);
- if (!connection)
- connection = GetConnection(view_id.connection_id);
- if (connection) {
- connection->client()->OnViewInputEvent(
- transport_view_id, event.Pass(), base::Bind(&base::DoNothing));
- }
+void ConnectionManager::SetViewportSize(mojo::SizePtr size) {
+ display_manager_->SetViewportSize(size.To<gfx::Size>());
}
void ConnectionManager::CloneAndAnimate(mojo::Id transport_view_id) {
« no previous file with comments | « components/view_manager/connection_manager.h ('k') | components/view_manager/event_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698