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

Unified Diff: mojo/shell/context.h

Issue 420143003: mojo: shell::Context should outlive the shell MessageLoop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix + verify android 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/shell/child_process_host_unittest.cc ('k') | mojo/shell/context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/context.h
diff --git a/mojo/shell/context.h b/mojo/shell/context.h
index 83ebf6385a07367d786108e9ba44a29e0afb2401..7cb288f1c7ddc040b4f516d4f23e80f73f008a4f 100644
--- a/mojo/shell/context.h
+++ b/mojo/shell/context.h
@@ -30,11 +30,12 @@ class Context {
Context();
~Context();
+ void Init();
// Tear down context in safe order prior to deleting. Shutdown() is also
// called by the destructor.
void Shutdown();
- TaskRunners* task_runners() { return &task_runners_; }
+ TaskRunners* task_runners() { return task_runners_.get(); }
ServiceManager* service_manager() { return &service_manager_; }
KeepAliveCounter* keep_alive_counter() { return &keep_alive_counter_; }
MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; }
@@ -47,7 +48,7 @@ class Context {
private:
class NativeViewportServiceLoader;
- TaskRunners task_runners_;
+ scoped_ptr<TaskRunners> task_runners_;
ServiceManager service_manager_;
MojoURLResolver mojo_url_resolver_;
scoped_ptr<Spy> spy_;
« no previous file with comments | « mojo/shell/child_process_host_unittest.cc ('k') | mojo/shell/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698