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

Unified Diff: shell/context.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/ui_application_loader_android.cc ('k') | shell/context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/context.h
diff --git a/shell/context.h b/shell/context.h
index 71ef68b606fff91119c6c666a7f26aede84bc58f..b7f129a21be2fc4d2f54f61b15881d407d58c4d2 100644
--- a/shell/context.h
+++ b/shell/context.h
@@ -12,10 +12,6 @@
#include "shell/mojo_url_resolver.h"
#include "shell/task_runners.h"
-#if defined(OS_ANDROID)
-#include "base/android/scoped_java_ref.h"
-#endif // defined(OS_ANDROID)
-
namespace mojo {
class Spy;
@@ -43,11 +39,6 @@ class Context : ApplicationManager::Delegate {
ApplicationManager* application_manager() { return &application_manager_; }
MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; }
-#if defined(OS_ANDROID)
- base::MessageLoop* ui_loop() const { return ui_loop_; }
- void set_ui_loop(base::MessageLoop* ui_loop) { ui_loop_ = ui_loop; }
-#endif // defined(OS_ANDROID)
-
private:
class NativeViewportApplicationLoader;
@@ -61,9 +52,6 @@ class Context : ApplicationManager::Delegate {
ApplicationManager application_manager_;
MojoURLResolver mojo_url_resolver_;
scoped_ptr<Spy> spy_;
-#if defined(OS_ANDROID)
- base::MessageLoop* ui_loop_;
-#endif // defined(OS_ANDROID)
DISALLOW_COPY_AND_ASSIGN(Context);
};
« no previous file with comments | « shell/android/ui_application_loader_android.cc ('k') | shell/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698