Remove loader for catalog & some other cleanup:

- instantiate the catalog shell client directly in the shell
- remove some obsolete comments
- move userid inheritance handling into the instance

R=sky@chromium.org

Review URL: https://codereview.chromium.org/1785743002

Cr-Commit-Position: refs/heads/master@{#380575}

1 files changed, 3 insertions, 0 deletions

diff --git a/mojo/shell/shell.h b/mojo/shell/shell.h
index 2d66593..e8f18fb 100644
--- a/mojo/shell/shell.h
+++ b/mojo/shell/shell.h
@@ -34,6 +34,7 @@ class SequencedWorkerPool;
 }
 
 namespace mojo {
+class ShellClient;
 class ShellConnection;
 namespace shell {
 
@@ -191,6 +192,8 @@ class Shell : public ShellClient {
   scoped_ptr<NativeRunnerFactory> native_runner_factory_;
   std::vector<scoped_ptr<NativeRunner>> native_runners_;
   scoped_ptr<ShellConnection> shell_connection_;
+  scoped_ptr<ShellConnection> catalog_connection_;
+  scoped_ptr<ShellClient> catalog_shell_client_;
   base::WeakPtrFactory<Shell> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);