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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: services/shell/shell.cc

Issue 2062333002: mojo::Callback -> base::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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
« mojo/public/cpp/bindings/tests/sync_method_unittest.cc ('K') | « services/shell/public/cpp/lib/shell_connection.cc ('k') | services/shell/tests/connect/connect_test_app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/shell.cc
diff --git a/services/shell/shell.cc b/services/shell/shell.cc
index c5aa2bdb7983be86dc166b8a62ac011e3b5d3ee8..a82ad5f68da0d609276199bf36bd2adeea1f1f86 100644
--- a/services/shell/shell.cc
+++ b/services/shell/shell.cc
@@ -167,8 +167,10 @@ class Shell::Instance : public mojom::Connector,
void ConnectToClient(std::unique_ptr<ConnectParams> params) {
CHECK(shell_client_.is_bound());
- params->connect_callback().Run(mojom::ConnectResult::SUCCEEDED,
- identity_.user_id(), id_);
+ if (!params->connect_callback().is_null()) {
+ params->connect_callback().Run(mojom::ConnectResult::SUCCEEDED,
+ identity_.user_id(), id_);
+ }
uint32_t source_id = mojom::kInvalidInstanceID;
CapabilityRequest request;
request.interfaces.insert("*");
« mojo/public/cpp/bindings/tests/sync_method_unittest.cc ('K') | « services/shell/public/cpp/lib/shell_connection.cc ('k') | services/shell/tests/connect/connect_test_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698