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

Unified Diff: mojo/shell/public/cpp/lib/connector_impl.cc

Issue 1736663003: Eliminate Quit() from Shell, and roll Shell & Connector together. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@14cf
Patch Set: . Created 4 years, 10 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/shell/public/cpp/lib/connector_impl.h ('k') | mojo/shell/public/cpp/lib/shell_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/public/cpp/lib/connector_impl.cc
diff --git a/mojo/shell/public/cpp/lib/connector_impl.cc b/mojo/shell/public/cpp/lib/connector_impl.cc
index 33cc1bf0aaa7b3a486ece064d0eef9a96ae0c7d9..5adf92151849300849d5e8fcb797c7c2ef8cbd8c 100644
--- a/mojo/shell/public/cpp/lib/connector_impl.cc
+++ b/mojo/shell/public/cpp/lib/connector_impl.cc
@@ -16,6 +16,12 @@ Connector::ConnectParams::~ConnectParams() {}
ConnectorImpl::ConnectorImpl(shell::mojom::ConnectorPtrInfo unbound_state)
: unbound_state_(std::move(unbound_state)) {}
+ConnectorImpl::ConnectorImpl(shell::mojom::ConnectorPtr connector,
+ const base::Closure& connection_error_closure)
+ : connector_(std::move(connector)) {
+ connector_.set_connection_error_handler(connection_error_closure);
+ thread_checker_.reset(new base::ThreadChecker);
+}
ConnectorImpl::~ConnectorImpl() {}
scoped_ptr<Connection> ConnectorImpl::Connect(const std::string& url) {
« no previous file with comments | « mojo/shell/public/cpp/lib/connector_impl.h ('k') | mojo/shell/public/cpp/lib/shell_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698