| 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 SHELL_CONTEXT_H_ |
| 6 #define MOJO_SHELL_CONTEXT_H_ | 6 #define SHELL_CONTEXT_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "mojo/application_manager/application_manager.h" | 11 #include "mojo/application_manager/application_manager.h" |
| 12 #include "mojo/shell/mojo_url_resolver.h" | 12 #include "shell/mojo_url_resolver.h" |
| 13 #include "mojo/shell/task_runners.h" | 13 #include "shell/task_runners.h" |
| 14 | 14 |
| 15 #if defined(OS_ANDROID) | 15 #if defined(OS_ANDROID) |
| 16 #include "base/android/scoped_java_ref.h" | 16 #include "base/android/scoped_java_ref.h" |
| 17 #endif // defined(OS_ANDROID) | 17 #endif // defined(OS_ANDROID) |
| 18 | 18 |
| 19 namespace mojo { | 19 namespace mojo { |
| 20 | 20 |
| 21 class Spy; | 21 class Spy; |
| 22 | 22 |
| 23 namespace shell { | 23 namespace shell { |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 #if defined(OS_ANDROID) | 64 #if defined(OS_ANDROID) |
| 65 base::MessageLoop* ui_loop_; | 65 base::MessageLoop* ui_loop_; |
| 66 #endif // defined(OS_ANDROID) | 66 #endif // defined(OS_ANDROID) |
| 67 | 67 |
| 68 DISALLOW_COPY_AND_ASSIGN(Context); | 68 DISALLOW_COPY_AND_ASSIGN(Context); |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 } // namespace shell | 71 } // namespace shell |
| 72 } // namespace mojo | 72 } // namespace mojo |
| 73 | 73 |
| 74 #endif // MOJO_SHELL_CONTEXT_H_ | 74 #endif // SHELL_CONTEXT_H_ |
| OLD | NEW |