| 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 SHELL_CONTEXT_H_ | 5 #ifndef SHELL_CONTEXT_H_ |
| 6 #define 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/common/trace_controller_impl.h" |
| 12 #include "shell/mojo_url_resolver.h" | 13 #include "shell/mojo_url_resolver.h" |
| 13 #include "shell/task_runners.h" | 14 #include "shell/task_runners.h" |
| 14 | 15 |
| 15 namespace mojo { | 16 namespace mojo { |
| 16 | 17 |
| 17 class Spy; | 18 class Spy; |
| 18 | 19 |
| 19 namespace shell { | 20 namespace shell { |
| 20 | 21 |
| 21 class DynamicApplicationLoader; | 22 class DynamicApplicationLoader; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 34 ScopedMessagePipeHandle ConnectToServiceByName( | 35 ScopedMessagePipeHandle ConnectToServiceByName( |
| 35 const GURL& application_url, | 36 const GURL& application_url, |
| 36 const std::string& service_name); | 37 const std::string& service_name); |
| 37 | 38 |
| 38 TaskRunners* task_runners() { return task_runners_.get(); } | 39 TaskRunners* task_runners() { return task_runners_.get(); } |
| 39 ApplicationManager* application_manager() { return &application_manager_; } | 40 ApplicationManager* application_manager() { return &application_manager_; } |
| 40 MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; } | 41 MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; } |
| 41 | 42 |
| 42 private: | 43 private: |
| 43 class NativeViewportApplicationLoader; | 44 class NativeViewportApplicationLoader; |
| 45 class TracingServiceProvider; |
| 44 | 46 |
| 45 // ApplicationManager::Delegate override. | 47 // ApplicationManager::Delegate override. |
| 46 void OnApplicationError(const GURL& url) override; | 48 void OnApplicationError(const GURL& url) override; |
| 47 GURL ResolveURL(const GURL& url) override; | 49 GURL ResolveURL(const GURL& url) override; |
| 48 | 50 |
| 49 std::set<GURL> app_urls_; | 51 std::set<GURL> app_urls_; |
| 50 scoped_ptr<TaskRunners> task_runners_; | 52 scoped_ptr<TaskRunners> task_runners_; |
| 51 scoped_ptr<ExternalApplicationListener> listener_; | 53 scoped_ptr<ExternalApplicationListener> listener_; |
| 52 ApplicationManager application_manager_; | 54 ApplicationManager application_manager_; |
| 53 MojoURLResolver mojo_url_resolver_; | 55 MojoURLResolver mojo_url_resolver_; |
| 54 scoped_ptr<Spy> spy_; | 56 scoped_ptr<Spy> spy_; |
| 57 scoped_ptr<TracingServiceProvider> tracing_sp_; |
| 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 // SHELL_CONTEXT_H_ | 65 #endif // SHELL_CONTEXT_H_ |
| OLD | NEW |