| Index: shell/ui_application_loader_android.cc
|
| diff --git a/mojo/shell/ui_application_loader_android.cc b/shell/ui_application_loader_android.cc
|
| similarity index 82%
|
| rename from mojo/shell/ui_application_loader_android.cc
|
| rename to shell/ui_application_loader_android.cc
|
| index b8717071323f8a3786b178ff023bb87215b9d081..7c2f2e3eb674981a58d9bfc9fd6338dd91abb679 100644
|
| --- a/mojo/shell/ui_application_loader_android.cc
|
| +++ b/shell/ui_application_loader_android.cc
|
| @@ -2,11 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/shell/ui_application_loader_android.h"
|
| +#include "shell/ui_application_loader_android.h"
|
|
|
| #include "base/bind.h"
|
| #include "mojo/application_manager/application_manager.h"
|
| -#include "mojo/shell/context.h"
|
| +#include "shell/context.h"
|
|
|
| namespace mojo {
|
|
|
| @@ -18,9 +18,8 @@ UIApplicationLoader::UIApplicationLoader(
|
|
|
| UIApplicationLoader::~UIApplicationLoader() {
|
| context_->ui_loop()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&UIApplicationLoader::ShutdownOnUIThread,
|
| - base::Unretained(this)));
|
| + FROM_HERE, base::Bind(&UIApplicationLoader::ShutdownOnUIThread,
|
| + base::Unretained(this)));
|
| }
|
|
|
| void UIApplicationLoader::Load(ApplicationManager* manager,
|
| @@ -37,11 +36,8 @@ void UIApplicationLoader::Load(ApplicationManager* manager,
|
| void UIApplicationLoader::OnApplicationError(ApplicationManager* manager,
|
| const GURL& url) {
|
| context_->ui_loop()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&UIApplicationLoader::OnApplicationErrorOnUIThread,
|
| - base::Unretained(this),
|
| - manager,
|
| - url));
|
| + FROM_HERE, base::Bind(&UIApplicationLoader::OnApplicationErrorOnUIThread,
|
| + base::Unretained(this), manager, url));
|
| }
|
|
|
| void UIApplicationLoader::LoadOnUIThread(ApplicationManager* manager,
|
|
|