OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 CHROMECAST_BROWSER_CAST_BROWSER_PROCESS_H_ | 5 #ifndef CHROMECAST_BROWSER_CAST_BROWSER_PROCESS_H_ |
6 #define CHROMECAST_BROWSER_CAST_BROWSER_PROCESS_H_ | 6 #define CHROMECAST_BROWSER_CAST_BROWSER_PROCESS_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
13 | 13 |
14 class PrefService; | 14 class PrefService; |
15 class PrefProxyConfigTracker; | |
15 | 16 |
16 namespace breakpad { | 17 namespace breakpad { |
17 class CrashDumpManager; | 18 class CrashDumpManager; |
18 } // namespace breakpad | 19 } // namespace breakpad |
19 | 20 |
20 namespace net { | 21 namespace net { |
21 class NetLog; | 22 class NetLog; |
23 class ProxyConfigService; | |
22 } // namespace net | 24 } // namespace net |
23 | 25 |
24 namespace chromecast { | 26 namespace chromecast { |
25 class CastService; | 27 class CastService; |
26 class CastScreen; | 28 class CastScreen; |
27 class ConnectivityChecker; | 29 class ConnectivityChecker; |
28 | 30 |
29 namespace metrics { | 31 namespace metrics { |
30 class CastMetricsHelper; | 32 class CastMetricsHelper; |
31 class CastMetricsServiceClient; | 33 class CastMetricsServiceClient; |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
83 } | 85 } |
84 PrefService* pref_service() const { return pref_service_.get(); } | 86 PrefService* pref_service() const { return pref_service_.get(); } |
85 CastResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() | 87 CastResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() |
86 const { | 88 const { |
87 return resource_dispatcher_host_delegate_.get(); | 89 return resource_dispatcher_host_delegate_.get(); |
88 } | 90 } |
89 ConnectivityChecker* connectivity_checker() const { | 91 ConnectivityChecker* connectivity_checker() const { |
90 return connectivity_checker_.get(); | 92 return connectivity_checker_.get(); |
91 } | 93 } |
92 net::NetLog* net_log() const { return net_log_; } | 94 net::NetLog* net_log() const { return net_log_; } |
95 PrefProxyConfigTracker* pref_proxy_config_tracker() const { | |
96 return pref_proxy_config_tracker_.get(); | |
97 } | |
93 | 98 |
94 private: | 99 private: |
100 std::unique_ptr<net::ProxyConfigService> proxy_config_service_; | |
101 std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; | |
wzhong
2017/01/27 23:37:17
This seems to need to be after pref_service_. See
almasrymina
2017/02/06 22:38:34
Done.
| |
95 // Note: The following order should match the order they are set in | 102 // Note: The following order should match the order they are set in |
96 // CastBrowserMainParts. | 103 // CastBrowserMainParts. |
97 std::unique_ptr<metrics::CastMetricsHelper> metrics_helper_; | 104 std::unique_ptr<metrics::CastMetricsHelper> metrics_helper_; |
98 #if defined(USE_AURA) | 105 #if defined(USE_AURA) |
99 std::unique_ptr<CastScreen> cast_screen_; | 106 std::unique_ptr<CastScreen> cast_screen_; |
100 #endif // defined(USE_AURA) | 107 #endif // defined(USE_AURA) |
101 std::unique_ptr<PrefService> pref_service_; | 108 std::unique_ptr<PrefService> pref_service_; |
102 scoped_refptr<ConnectivityChecker> connectivity_checker_; | 109 scoped_refptr<ConnectivityChecker> connectivity_checker_; |
103 std::unique_ptr<CastBrowserContext> browser_context_; | 110 std::unique_ptr<CastBrowserContext> browser_context_; |
104 std::unique_ptr<metrics::CastMetricsServiceClient> metrics_service_client_; | 111 std::unique_ptr<metrics::CastMetricsServiceClient> metrics_service_client_; |
(...skipping 10 matching lines...) Expand all Loading... | |
115 // Note: CastService must be destroyed before others. | 122 // Note: CastService must be destroyed before others. |
116 std::unique_ptr<CastService> cast_service_; | 123 std::unique_ptr<CastService> cast_service_; |
117 | 124 |
118 DISALLOW_COPY_AND_ASSIGN(CastBrowserProcess); | 125 DISALLOW_COPY_AND_ASSIGN(CastBrowserProcess); |
119 }; | 126 }; |
120 | 127 |
121 } // namespace shell | 128 } // namespace shell |
122 } // namespace chromecast | 129 } // namespace chromecast |
123 | 130 |
124 #endif // CHROMECAST_BROWSER_CAST_BROWSER_PROCESS_H_ | 131 #endif // CHROMECAST_BROWSER_CAST_BROWSER_PROCESS_H_ |
OLD | NEW |