| Index: shell/android/ui_application_loader_android.h
|
| diff --git a/shell/ui_application_loader_android.h b/shell/android/ui_application_loader_android.h
|
| similarity index 84%
|
| rename from shell/ui_application_loader_android.h
|
| rename to shell/android/ui_application_loader_android.h
|
| index 64b13f07a97f3e9d6d31561fedb98b2960c641f1..7de34c721031cdac67186141adf48bfadc25ff4d 100644
|
| --- a/shell/ui_application_loader_android.h
|
| +++ b/shell/android/ui_application_loader_android.h
|
| @@ -2,28 +2,28 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SHELL_UI_APPLICATION_LOADER_ANDROID_H_
|
| -#define SHELL_UI_APPLICATION_LOADER_ANDROID_H_
|
| +#ifndef SHELL_ANDROID_UI_APPLICATION_LOADER_ANDROID_H_
|
| +#define SHELL_ANDROID_UI_APPLICATION_LOADER_ANDROID_H_
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "mojo/application_manager/application_loader.h"
|
|
|
| +namespace base {
|
| +class MessageLoop;
|
| +}
|
| +
|
| namespace mojo {
|
|
|
| class ApplicationManager;
|
|
|
| -namespace shell {
|
| -class Context;
|
| -}
|
| -
|
| // ApplicationLoader implementation that creates a background thread and issues
|
| // load
|
| // requests there.
|
| class UIApplicationLoader : public ApplicationLoader {
|
| public:
|
| UIApplicationLoader(scoped_ptr<ApplicationLoader> real_loader,
|
| - shell::Context* context);
|
| + base::MessageLoop* ui_message_loop);
|
| ~UIApplicationLoader() override;
|
|
|
| // ApplicationLoader overrides:
|
| @@ -49,11 +49,11 @@ class UIApplicationLoader : public ApplicationLoader {
|
| void ShutdownOnUIThread();
|
|
|
| scoped_ptr<ApplicationLoader> loader_;
|
| - shell::Context* context_;
|
| + base::MessageLoop* ui_message_loop_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(UIApplicationLoader);
|
| };
|
|
|
| } // namespace mojo
|
|
|
| -#endif // SHELL_UI_APPLICATION_LOADER_ANDROID_H_
|
| +#endif // SHELL_ANDROID_UI_APPLICATION_LOADER_ANDROID_H_
|
|
|