summaryrefslogtreecommitdiffstats
path: root/mojo/shell
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-21 22:35:58 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-21 22:35:58 +0000
commitfbd14d43f4a0324deb37f2f8eda6117a3272d64b (patch)
tree3d1d73d6ab9f620151772fb29094f9944c49412f /mojo/shell
parentc4feb21dd26f25747f55c9ebefa93e8f4e955504 (diff)
downloadchromium_src-fbd14d43f4a0324deb37f2f8eda6117a3272d64b.zip
chromium_src-fbd14d43f4a0324deb37f2f8eda6117a3272d64b.tar.gz
chromium_src-fbd14d43f4a0324deb37f2f8eda6117a3272d64b.tar.bz2
Mojo: Minor comment improvements/fixes/additions for mojo_shell.
TBR=ben@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/208983002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
-rw-r--r--mojo/shell/app_child_process.h2
-rw-r--r--mojo/shell/app_child_process_host.h3
-rw-r--r--mojo/shell/child_process.h1
-rw-r--r--mojo/shell/context.h1
-rw-r--r--mojo/shell/dynamic_service_loader.h11
-rw-r--r--mojo/shell/dynamic_service_runner.h2
-rw-r--r--mojo/shell/in_process_dynamic_service_runner.h2
-rw-r--r--mojo/shell/init.h2
-rw-r--r--mojo/shell/out_of_process_dynamic_service_runner.h2
-rw-r--r--mojo/shell/storage.h2
-rw-r--r--mojo/shell/task_runners.h3
11 files changed, 22 insertions, 9 deletions
diff --git a/mojo/shell/app_child_process.h b/mojo/shell/app_child_process.h
index 6665612..b5b1eb6 100644
--- a/mojo/shell/app_child_process.h
+++ b/mojo/shell/app_child_process.h
@@ -11,6 +11,8 @@
namespace mojo {
namespace shell {
+// An implementation of |ChildProcess| for a |TYPE_APP| child process, which
+// runs a single app (loaded from the file system) on its main thread.
class AppChildProcess : public ChildProcess {
public:
AppChildProcess();
diff --git a/mojo/shell/app_child_process_host.h b/mojo/shell/app_child_process_host.h
index 263b408..8ecc6e9 100644
--- a/mojo/shell/app_child_process_host.h
+++ b/mojo/shell/app_child_process_host.h
@@ -18,6 +18,9 @@ struct ChannelInfo;
namespace shell {
+// A subclass of |ChildProcessHost| to host a |TYPE_APP| child process, which
+// runs a single app (loaded from the file system).
+//
// Note: After |Start()|, this object must remain alive until the controller
// client's |AppCompleted()| is called.
class AppChildProcessHost : public ChildProcessHost,
diff --git a/mojo/shell/child_process.h b/mojo/shell/child_process.h
index 8e4d4c6..d794a4e 100644
--- a/mojo/shell/child_process.h
+++ b/mojo/shell/child_process.h
@@ -21,7 +21,6 @@ namespace shell {
class ChildProcess {
public:
enum Type {
- // TODO(vtl): Add real types here.
TYPE_TEST,
// Hosts a single app (see app_child_process(_host).*).
TYPE_APP
diff --git a/mojo/shell/context.h b/mojo/shell/context.h
index d988ae0..3034eb7 100644
--- a/mojo/shell/context.h
+++ b/mojo/shell/context.h
@@ -20,6 +20,7 @@ namespace shell {
class DynamicServiceLoader;
+// The "global" context for the shell's main process.
class Context {
public:
Context();
diff --git a/mojo/shell/dynamic_service_loader.h b/mojo/shell/dynamic_service_loader.h
index a954ba5..ce36663 100644
--- a/mojo/shell/dynamic_service_loader.h
+++ b/mojo/shell/dynamic_service_loader.h
@@ -21,18 +21,19 @@ namespace shell {
class Context;
class DynamicServiceRunnerFactory;
-// A subclass of ServiceManager::Loader that loads a dynamic library containing
-// the implementation of the service.
+// An implementation of ServiceLoader that retrieves a dynamic library
+// containing the implementation of the service and loads/runs it (via a
+// DynamicServiceRunner).
class DynamicServiceLoader : public ServiceLoader {
public:
DynamicServiceLoader(Context* context,
scoped_ptr<DynamicServiceRunnerFactory> runner_factory);
virtual ~DynamicServiceLoader();
- // Initiates the dynamic load. If the url is a mojo: scheme then the name
- // specified will be modified to the platform's naming scheme. Also the
+ // Initiates the dynamic load. If the URL has a mojo: scheme, then the name
+ // specified will be modified to the platform's naming scheme. Also, the
// value specified to the --origin command line argument will be used as the
- // host / port.
+ // host/port.
virtual void LoadService(ServiceManager* manager,
const GURL& url,
ScopedShellHandle service_handle) OVERRIDE;
diff --git a/mojo/shell/dynamic_service_runner.h b/mojo/shell/dynamic_service_runner.h
index 00a92a5..0319531 100644
--- a/mojo/shell/dynamic_service_runner.h
+++ b/mojo/shell/dynamic_service_runner.h
@@ -19,6 +19,8 @@ namespace shell {
class Context;
+// Abstraction for loading a service (from the file system) and running it (on
+// another thread or in a separate process).
class DynamicServiceRunner {
public:
virtual ~DynamicServiceRunner() {}
diff --git a/mojo/shell/in_process_dynamic_service_runner.h b/mojo/shell/in_process_dynamic_service_runner.h
index e95eeb5..95cebb1 100644
--- a/mojo/shell/in_process_dynamic_service_runner.h
+++ b/mojo/shell/in_process_dynamic_service_runner.h
@@ -14,6 +14,8 @@
namespace mojo {
namespace shell {
+// An implementation of |DynamicServiceRunner| that loads/runs the given app
+// (from the file system) on a separate thread (in the current process).
class InProcessDynamicServiceRunner
: public DynamicServiceRunner,
public base::DelegateSimpleThread::Delegate {
diff --git a/mojo/shell/init.h b/mojo/shell/init.h
index 52e6fae..c83134a 100644
--- a/mojo/shell/init.h
+++ b/mojo/shell/init.h
@@ -8,7 +8,7 @@
namespace mojo {
namespace shell {
-// Initialization routines shared by desktop and android main functions.
+// Initialization routines shared by desktop and Android main functions.
void InitializeLogging();
diff --git a/mojo/shell/out_of_process_dynamic_service_runner.h b/mojo/shell/out_of_process_dynamic_service_runner.h
index 073cc0a..bee4e19 100644
--- a/mojo/shell/out_of_process_dynamic_service_runner.h
+++ b/mojo/shell/out_of_process_dynamic_service_runner.h
@@ -15,6 +15,8 @@
namespace mojo {
namespace shell {
+// An implementation of |DynamicServiceRunner| that loads/runs the given app
+// (from the file system) in a separate process (of its own).
class OutOfProcessDynamicServiceRunner
: public DynamicServiceRunner,
public mojo_shell::AppChildControllerClient {
diff --git a/mojo/shell/storage.h b/mojo/shell/storage.h
index 08c1ea2..ac9d578 100644
--- a/mojo/shell/storage.h
+++ b/mojo/shell/storage.h
@@ -10,7 +10,7 @@
namespace mojo {
namespace shell {
-// A object that represents the persistent storage used by the shell.
+// An object that represents the persistent storage used by the shell.
class Storage {
public:
Storage();
diff --git a/mojo/shell/task_runners.h b/mojo/shell/task_runners.h
index a6b59b4..17cdf89 100644
--- a/mojo/shell/task_runners.h
+++ b/mojo/shell/task_runners.h
@@ -18,7 +18,8 @@ class SequencedWorkerPool;
namespace mojo {
namespace shell {
-// A context object that contains the common task runners for the shell
+// A context object that contains the common task runners for the shell's main
+// process.
class TaskRunners {
public:
explicit TaskRunners(base::SingleThreadTaskRunner* ui_runner);