| 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_;
|
|
|