mojo::Callback -> base::Callback

services/shell/shell.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/shell/shell.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 149 matching lines @@
 
   void RemoveChild(Instance* child) {
     auto it = children_.find(child);
     DCHECK(it != children_.end());
     children_.erase(it);
     child->parent_ = nullptr;
   }
 
   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("*");
     Instance* source = shell_->GetExistingInstance(params->source());
     if (source) {
       request = GenerateCapabilityRequestForConnection(
           source->capability_spec_, identity_, capability_spec_);
       source_id = source->id();
     }
 
@@ skipping 601 matching lines @@
 
   // Now that the instance has a ShellClient, we can connect to it.
   instance->ConnectToClient(std::move(params));
 }
 
 base::WeakPtr<Shell> Shell::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace shell