Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "mojo/service_manager/service_manager.h" | 8 #include "mojo/service_manager/service_manager.h" |
| 9 #include "mojo/shell/keep_alive.h" | 9 #include "mojo/shell/keep_alive.h" |
| 10 #include "mojo/shell/loader.h" | 10 #include "mojo/shell/loader.h" |
| 11 #include "mojo/shell/storage.h" | 11 #include "mojo/shell/storage.h" |
| 12 #include "mojo/shell/task_runners.h" | 12 #include "mojo/shell/task_runners.h" |
| 13 | 13 |
| 14 #if defined(OS_ANDROID) | 14 #if defined(OS_ANDROID) |
| 15 #include "base/android/scoped_java_ref.h" | 15 #include "base/android/scoped_java_ref.h" |
| 16 #endif // defined(OS_ANDROID) | 16 #endif // defined(OS_ANDROID) |
| 17 | 17 |
| 18 namespace mojo { | 18 namespace mojo { |
| 19 | 19 |
| 20 class Spy; | 20 class Spy; |
| 21 | 21 |
| 22 namespace shell { | 22 namespace shell { |
| 23 | |
|
viettrungluu
2014/04/23 20:07:24
nit: It probably wasn't necessary to delete this b
Chris Masone
2014/04/23 22:31:00
I blame a shoddy merge!
| |
| 24 class DynamicServiceLoader; | 23 class DynamicServiceLoader; |
| 25 | 24 |
| 26 // The "global" context for the shell's main process. | 25 // The "global" context for the shell's main process. |
| 27 class Context { | 26 class Context { |
| 28 public: | 27 public: |
| 29 Context(); | 28 Context(); |
| 30 ~Context(); | 29 ~Context(); |
| 31 | 30 |
| 32 TaskRunners* task_runners() { return &task_runners_; } | 31 TaskRunners* task_runners() { return &task_runners_; } |
| 33 Storage* storage() { return &storage_; } | 32 Storage* storage() { return &storage_; } |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 53 | 52 |
| 54 KeepAliveCounter keep_alive_counter_; | 53 KeepAliveCounter keep_alive_counter_; |
| 55 | 54 |
| 56 DISALLOW_COPY_AND_ASSIGN(Context); | 55 DISALLOW_COPY_AND_ASSIGN(Context); |
| 57 }; | 56 }; |
| 58 | 57 |
| 59 } // namespace shell | 58 } // namespace shell |
| 60 } // namespace mojo | 59 } // namespace mojo |
| 61 | 60 |
| 62 #endif // MOJO_SHELL_CONTEXT_H_ | 61 #endif // MOJO_SHELL_CONTEXT_H_ |
| OLD | NEW |