ContentHandler -> ShellClientFactory

mojo/shell/public/cpp/connection.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_PUBLIC_CPP_CONNECTION_H_
 #define MOJO_SHELL_PUBLIC_CPP_CONNECTION_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 77 matching lines @@
       const Closure& handler) = 0;
 
   // Returns the id of the remote application. For Connections created via
   // Shell::Connect(), this will not be determined until Connect()'s callback is
   // run, and this function will return false. Use AddRemoteIDCallback() to
   // schedule a callback to be run when the remote application id is available.
   // A value of Shell::kInvalidApplicationID indicates the connection has not
   // been established.
   virtual bool GetRemoteApplicationID(uint32_t* remote_id) const = 0;
 
-  // Returns the id of the deepest content handler used in connecting to
+  // Returns the id of the deepest shell client factory used in connecting to
   // the application. See GetRemoteApplicationID() for details about the return
-  // value. A |content_handler_id| value of Shell::kInvalidApplicationID
-  // indicates no content handler was used in connecting to the application.
-  virtual bool GetRemoteContentHandlerID(
-      uint32_t* content_handler_id) const = 0;
+  // value. A |shell_client_factory_id| value of Shell::kInvalidApplicationID
+  // indicates no shell client factory was used in connecting to the
+  // application.
+  virtual bool GetRemoteShellClientFactoryID(
+      uint32_t* shell_client_factory_id) const = 0;
 
-  // See description in GetRemoteApplicationID()/GetRemoteContentHandlerID(). If
-  // the ids are available, |callback| is run immediately.
+  // See description in GetRemoteApplicationID()/
+  // GetRemoteShellClientFactoryID(). If the ids are available, |callback| is
+  // run immediately.
   virtual void AddRemoteIDCallback(const Closure& callback) = 0;
 
   // Returns true if the Shell allows |interface_name| to be exposed to the
   // remote application.
   virtual bool AllowsInterface(const std::string& interface_name) const = 0;
 
   // Returns the raw proxy to the remote application's InterfaceProvider
   // interface. Most applications will just use GetInterface() instead.
   // Caller does not take ownership.
   virtual shell::mojom::InterfaceProvider* GetRemoteInterfaces() = 0;
 
  protected:
   virtual InterfaceRegistry* GetLocalRegistry() = 0;
 
   virtual base::WeakPtr<Connection> GetWeakPtr() = 0;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_CONNECTION_H_