summaryrefslogtreecommitdiffstats
path: root/mash/shell/shell_application_delegate.cc
diff options
context:
space:
mode:
Diffstat (limited to 'mash/shell/shell_application_delegate.cc')
-rw-r--r--mash/shell/shell_application_delegate.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/mash/shell/shell_application_delegate.cc b/mash/shell/shell_application_delegate.cc
index a88c6d6..032ad13 100644
--- a/mash/shell/shell_application_delegate.cc
+++ b/mash/shell/shell_application_delegate.cc
@@ -117,12 +117,8 @@ void ShellApplicationDelegate::StartRestartableService(
// TODO(beng): This would be the place to insert logic that counted restarts
// to avoid infinite crash-restart loops.
scoped_ptr<mojo::Connection> connection = shell_->Connect(url);
- // Note: |connection| may be null if we've lost our connection to the shell.
- if (connection) {
- connection->SetRemoteServiceProviderConnectionErrorHandler(
- restart_callback);
- connections_[url] = std::move(connection);
- }
+ connection->SetRemoteServiceProviderConnectionErrorHandler(restart_callback);
+ connections_[url] = std::move(connection);
}
} // namespace shell