Simplify resolve.

mojo/shell/shell.h

 // 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.
 
 #ifndef MOJO_SHELL_SHELL_H_
 #define MOJO_SHELL_SHELL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 124 matching lines @@
   // If there is not one running one is started for |source_identity|.
   mojom::ShellClientFactory* GetShellClientFactory(
       const Identity& shell_client_factory_identity,
       const Identity& source_identity);
   void OnShellClientFactoryLost(const Identity& which);
 
   // Callback when remote Catalog resolves mojo:foo to mojo:bar.
   // |params| are the params passed to Connect().
   // |client| if provided is a ShellClientPtr which should be used to manage the
   // new application instance. This may be null.
-  // |resolved_name| is the mojo: name identifying the physical package
-  // application.
-  // |file_url| is the resolved file:// URL of the physical package.
-  // |capabilities| is the CapabilitySpecPtr the requested application should be
-  // run with, from its manifest.
+  // |result| contains the result of the resolve operation.
   void OnGotResolvedName(mojom::ShellResolverPtr resolver,
                          scoped_ptr<ConnectParams> params,
                          mojom::ShellClientPtr client,
-                         const String& resolved_name,
-                         const String& resolved_instance,
-                         mojom::CapabilitySpecPtr capabilities,
-                         const String& file_url);
+                         mojom::ResolveResultPtr result);
 
   // Tries to load |target| with an Loader. Returns true if one was registered
   // and it was loaded, in which case |request| is taken.
   bool LoadWithLoader(const Identity& target,
                       mojom::ShellClientRequest* request);
 
   // Returns the appropriate loader for |name|, or the default loader if there
   // is no loader configured for the name.
   Loader* GetLoaderForName(const std::string& name);
 
@@ skipping 26 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 mojom::Connector::ConnectCallback EmptyConnectCallback();
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_SHELL_H_