| Index: mojo/shell/static_application_loader.cc
|
| diff --git a/mojo/shell/static_application_loader.cc b/mojo/shell/static_application_loader.cc
|
| index b609fcde33572591fb99aa3f63e793d3012c7b59..c7e7f5eb77a04b8fb15fd011da1b0efc78107fa7 100644
|
| --- a/mojo/shell/static_application_loader.cc
|
| +++ b/mojo/shell/static_application_loader.cc
|
| @@ -25,7 +25,7 @@ namespace {
|
| class RunnerThread : public base::SimpleThread {
|
| public:
|
| RunnerThread(const GURL& url,
|
| - InterfaceRequest<Application> request,
|
| + InterfaceRequest<mojom::Application> request,
|
| scoped_refptr<base::TaskRunner> exit_task_runner,
|
| const base::Closure& exit_callback,
|
| const StaticApplicationLoader::ApplicationFactory& factory)
|
| @@ -44,7 +44,7 @@ class RunnerThread : public base::SimpleThread {
|
| }
|
|
|
| private:
|
| - InterfaceRequest<Application> request_;
|
| + InterfaceRequest<mojom::Application> request_;
|
| scoped_refptr<base::TaskRunner> exit_task_runner_;
|
| base::Closure exit_callback_;
|
| StaticApplicationLoader::ApplicationFactory factory_;
|
| @@ -70,8 +70,9 @@ StaticApplicationLoader::~StaticApplicationLoader() {
|
| StopAppThread();
|
| }
|
|
|
| -void StaticApplicationLoader::Load(const GURL& url,
|
| - InterfaceRequest<Application> request) {
|
| +void StaticApplicationLoader::Load(
|
| + const GURL& url,
|
| + InterfaceRequest<mojom::Application> request) {
|
| if (thread_)
|
| return;
|
|
|
|
|