| Index: content/common/mojo/static_loader.h
|
| diff --git a/content/common/mojo/static_loader.h b/content/common/mojo/static_loader.h
|
| index b281aee2428c17237d0e727017105203de39bbe7..fc2319403e83f37c4435e94d14f8a4479d7804f3 100644
|
| --- a/content/common/mojo/static_loader.h
|
| +++ b/content/common/mojo/static_loader.h
|
| @@ -16,20 +16,20 @@ namespace base {
|
| class SimpleThread;
|
| }
|
|
|
| -namespace mojo {
|
| +namespace shell {
|
| class ShellClient;
|
| }
|
|
|
| namespace content {
|
|
|
| // An Loader which loads a single type of app from a given
|
| -// mojo::ShellClientFactory. A Load() request is fulfilled by creating an
|
| +// shell::ShellClientFactory. A Load() request is fulfilled by creating an
|
| // instance of the app on a new thread. Only one instance of the app will run at
|
| // a time. Any Load requests received while the app is running will be dropped.
|
| -class StaticLoader : public mojo::shell::Loader {
|
| +class StaticLoader : public shell::Loader {
|
| public:
|
| using ApplicationFactory =
|
| - base::Callback<std::unique_ptr<mojo::ShellClient>()>;
|
| + base::Callback<std::unique_ptr<shell::ShellClient>()>;
|
|
|
| // Constructs a static loader for |factory|.
|
| explicit StaticLoader(const ApplicationFactory& factory);
|
| @@ -41,9 +41,9 @@ class StaticLoader : public mojo::shell::Loader {
|
|
|
| ~StaticLoader() override;
|
|
|
| - // mojo::shell::Loader:
|
| + // shell::Loader:
|
| void Load(const std::string& name,
|
| - mojo::shell::mojom::ShellClientRequest request) override;
|
| + shell::mojom::ShellClientRequest request) override;
|
|
|
| private:
|
| void StopAppThread();
|
|
|