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

Side by Side Diff: mojo/shell/context.h

Issue 399663002: Have mojo_shell run in its custom thread on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 5 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « mojo/shell/android/mojo_main.cc ('k') | mojo/shell/context.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MOJO_SHELL_CONTEXT_H_ 5 #ifndef MOJO_SHELL_CONTEXT_H_
6 #define MOJO_SHELL_CONTEXT_H_ 6 #define MOJO_SHELL_CONTEXT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "mojo/service_manager/service_manager.h" 10 #include "mojo/service_manager/service_manager.h"
(...skipping 20 matching lines...) Expand all
31 ~Context(); 31 ~Context();
32 32
33 TaskRunners* task_runners() { return &task_runners_; } 33 TaskRunners* task_runners() { return &task_runners_; }
34 ServiceManager* service_manager() { return &service_manager_; } 34 ServiceManager* service_manager() { return &service_manager_; }
35 KeepAliveCounter* keep_alive_counter() { return &keep_alive_counter_; } 35 KeepAliveCounter* keep_alive_counter() { return &keep_alive_counter_; }
36 MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; } 36 MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; }
37 37
38 #if defined(OS_ANDROID) 38 #if defined(OS_ANDROID)
39 jobject activity() const { return activity_.obj(); } 39 jobject activity() const { return activity_.obj(); }
40 void set_activity(jobject activity) { activity_.Reset(NULL, activity); } 40 void set_activity(jobject activity) { activity_.Reset(NULL, activity); }
41 base::MessageLoop* ui_loop() const { return ui_loop_; }
42 void set_ui_loop(base::MessageLoop* ui_loop) { ui_loop_ = ui_loop; }
41 #endif // defined(OS_ANDROID) 43 #endif // defined(OS_ANDROID)
42 44
43 private: 45 private:
44 class NativeViewportServiceLoader; 46 class NativeViewportServiceLoader;
45 47
46 TaskRunners task_runners_; 48 TaskRunners task_runners_;
47 ServiceManager service_manager_; 49 ServiceManager service_manager_;
48 MojoURLResolver mojo_url_resolver_; 50 MojoURLResolver mojo_url_resolver_;
49 scoped_ptr<Spy> spy_; 51 scoped_ptr<Spy> spy_;
50 #if defined(OS_ANDROID) 52 #if defined(OS_ANDROID)
51 base::android::ScopedJavaGlobalRef<jobject> activity_; 53 base::android::ScopedJavaGlobalRef<jobject> activity_;
54 base::MessageLoop* ui_loop_;
52 #endif // defined(OS_ANDROID) 55 #endif // defined(OS_ANDROID)
53 56
54 KeepAliveCounter keep_alive_counter_; 57 KeepAliveCounter keep_alive_counter_;
55 58
56 DISALLOW_COPY_AND_ASSIGN(Context); 59 DISALLOW_COPY_AND_ASSIGN(Context);
57 }; 60 };
58 61
59 } // namespace shell 62 } // namespace shell
60 } // namespace mojo 63 } // namespace mojo
61 64
62 #endif // MOJO_SHELL_CONTEXT_H_ 65 #endif // MOJO_SHELL_CONTEXT_H_
OLDNEW
« no previous file with comments | « mojo/shell/android/mojo_main.cc ('k') | mojo/shell/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698