Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1876)

Unified Diff: shell/android/ui_application_loader_android.h

Issue 805113002: Moves android specific code into android directory (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: merge 2 trunk Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « shell/android/mojo_main.cc ('k') | shell/android/ui_application_loader_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_
« no previous file with comments | « shell/android/mojo_main.cc ('k') | shell/android/ui_application_loader_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698