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

Unified Diff: services/ui/view_manager/view_manager_app.cc

Issue 1949233002: Create a RegisterViewAssociate method in ViewManager (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: add tests to mojo tests Created 4 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 | « services/ui/view_manager/view_manager_app.h ('k') | services/ui/view_manager/view_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/view_manager/view_manager_app.cc
diff --git a/services/ui/view_manager/view_manager_app.cc b/services/ui/view_manager/view_manager_app.cc
index 171d8bc17fbd29f906852dc9b6cc5630aef8fe34..3ea2d69231019d5a6b0176bbb4a60a8bfc5c7038 100644
--- a/services/ui/view_manager/view_manager_app.cc
+++ b/services/ui/view_manager/view_manager_app.cc
@@ -44,19 +44,6 @@ void ViewManagerApp::Initialize(mojo::ApplicationImpl* app_impl) {
// Create the registry.
registry_.reset(new ViewRegistry(compositor.Pass()));
-
- // Connect to associates.
- // TODO(jeffbrown): Consider making the launcher register associates
- // with the view manager or perhaps per view tree.
- std::vector<std::string> associate_urls = command_line->GetArgs();
- if (associate_urls.empty()) {
- // TODO(jeffbrown): Replace this hardcoded list.
- associate_urls.push_back("mojo:input_manager_service");
- }
- registry_->ConnectAssociates(
- app_impl_, associate_urls,
- base::Bind(&ViewManagerApp::OnAssociateConnectionError,
- base::Unretained(this)));
}
bool ViewManagerApp::ConfigureIncomingConnection(
@@ -76,11 +63,6 @@ void ViewManagerApp::OnCompositorConnectionError() {
Shutdown();
}
-void ViewManagerApp::OnAssociateConnectionError(const std::string& url) {
- LOG(ERROR) << "Exiting due to view associate connection error: url=" << url;
- Shutdown();
-}
-
void ViewManagerApp::Shutdown() {
app_impl_->Terminate();
}
« no previous file with comments | « services/ui/view_manager/view_manager_app.h ('k') | services/ui/view_manager/view_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698