Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Side by Side Diff: chrome/browser/io_thread.h

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/interstitials/chrome_metrics_helper.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CHROME_BROWSER_IO_THREAD_H_ 5 #ifndef CHROME_BROWSER_IO_THREAD_H_
6 #define CHROME_BROWSER_IO_THREAD_H_ 6 #define CHROME_BROWSER_IO_THREAD_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "base/memory/weak_ptr.h" 21 #include "base/memory/weak_ptr.h"
22 #include "base/strings/string_piece.h" 22 #include "base/strings/string_piece.h"
23 #include "base/time/time.h" 23 #include "base/time/time.h"
24 #include "build/build_config.h" 24 #include "build/build_config.h"
25 #include "chrome/browser/net/chrome_network_delegate.h" 25 #include "chrome/browser/net/chrome_network_delegate.h"
26 #include "chrome/common/features.h" 26 #include "chrome/common/features.h"
27 #include "components/prefs/pref_member.h" 27 #include "components/prefs/pref_member.h"
28 #include "components/ssl_config/ssl_config_service_manager.h" 28 #include "components/ssl_config/ssl_config_service_manager.h"
29 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/browser_thread_delegate.h" 30 #include "content/public/browser/browser_thread_delegate.h"
31 #include "extensions/features/features.h"
31 #include "net/base/network_change_notifier.h" 32 #include "net/base/network_change_notifier.h"
32 #include "net/http/http_network_session.h" 33 #include "net/http/http_network_session.h"
33 34
34 class PrefProxyConfigTracker; 35 class PrefProxyConfigTracker;
35 class PrefService; 36 class PrefService;
36 class PrefRegistrySimple; 37 class PrefRegistrySimple;
37 class SystemURLRequestContextGetter; 38 class SystemURLRequestContextGetter;
38 39
39 #if BUILDFLAG(ANDROID_JAVA_UI) 40 #if BUILDFLAG(ANDROID_JAVA_UI)
40 namespace chrome { 41 namespace chrome {
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 std::unique_ptr<net::ProxyService> system_proxy_service; 177 std::unique_ptr<net::ProxyService> system_proxy_service;
177 std::unique_ptr<net::HttpNetworkSession> system_http_network_session; 178 std::unique_ptr<net::HttpNetworkSession> system_http_network_session;
178 std::unique_ptr<net::HttpTransactionFactory> 179 std::unique_ptr<net::HttpTransactionFactory>
179 system_http_transaction_factory; 180 system_http_transaction_factory;
180 std::unique_ptr<net::URLRequestJobFactory> system_url_request_job_factory; 181 std::unique_ptr<net::URLRequestJobFactory> system_url_request_job_factory;
181 std::unique_ptr<net::URLRequestContext> system_request_context; 182 std::unique_ptr<net::URLRequestContext> system_request_context;
182 SystemRequestContextLeakChecker system_request_context_leak_checker; 183 SystemRequestContextLeakChecker system_request_context_leak_checker;
183 // |system_cookie_store| and |system_channel_id_service| are shared 184 // |system_cookie_store| and |system_channel_id_service| are shared
184 // between |proxy_script_fetcher_context| and |system_request_context|. 185 // between |proxy_script_fetcher_context| and |system_request_context|.
185 std::unique_ptr<net::CookieStore> system_cookie_store; 186 std::unique_ptr<net::CookieStore> system_cookie_store;
186 #if defined(ENABLE_EXTENSIONS) 187 #if BUILDFLAG(ENABLE_EXTENSIONS)
187 scoped_refptr<extensions::EventRouterForwarder> 188 scoped_refptr<extensions::EventRouterForwarder>
188 extension_event_router_forwarder; 189 extension_event_router_forwarder;
189 #endif 190 #endif
190 std::unique_ptr<net::HostMappingRules> host_mapping_rules; 191 std::unique_ptr<net::HostMappingRules> host_mapping_rules;
191 std::unique_ptr<net::HttpUserAgentSettings> http_user_agent_settings; 192 std::unique_ptr<net::HttpUserAgentSettings> http_user_agent_settings;
192 std::unique_ptr<net::NetworkQualityEstimator> network_quality_estimator; 193 std::unique_ptr<net::NetworkQualityEstimator> network_quality_estimator;
193 194
194 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a 195 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a
195 // main frame load fails with a DNS error in order to provide more useful 196 // main frame load fails with a DNS error in order to provide more useful
196 // information to the renderer so it can show a more specific error page. 197 // information to the renderer so it can show a more specific error page.
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 void ChangedToOnTheRecordOnIOThread(); 289 void ChangedToOnTheRecordOnIOThread();
289 290
290 void UpdateDnsClientEnabled(); 291 void UpdateDnsClientEnabled();
291 void UpdateServerWhitelist(); 292 void UpdateServerWhitelist();
292 void UpdateDelegateWhitelist(); 293 void UpdateDelegateWhitelist();
293 void UpdateAndroidAuthNegotiateAccountType(); 294 void UpdateAndroidAuthNegotiateAccountType();
294 void UpdateNegotiateDisableCnameLookup(); 295 void UpdateNegotiateDisableCnameLookup();
295 void UpdateNegotiateEnablePort(); 296 void UpdateNegotiateEnablePort();
296 297
297 extensions::EventRouterForwarder* extension_event_router_forwarder() { 298 extensions::EventRouterForwarder* extension_event_router_forwarder() {
298 #if defined(ENABLE_EXTENSIONS) 299 #if BUILDFLAG(ENABLE_EXTENSIONS)
299 return extension_event_router_forwarder_; 300 return extension_event_router_forwarder_;
300 #else 301 #else
301 return NULL; 302 return NULL;
302 #endif 303 #endif
303 } 304 }
304 static net::URLRequestContext* ConstructSystemRequestContext( 305 static net::URLRequestContext* ConstructSystemRequestContext(
305 IOThread::Globals* globals, 306 IOThread::Globals* globals,
306 const net::HttpNetworkSession::Params& params, 307 const net::HttpNetworkSession::Params& params,
307 net::NetLog* net_log); 308 net::NetLog* net_log);
308 309
(...skipping 10 matching lines...) Expand all
319 // See IOThread::Globals for details. 320 // See IOThread::Globals for details.
320 static net::URLRequestContext* ConstructProxyScriptFetcherContext( 321 static net::URLRequestContext* ConstructProxyScriptFetcherContext(
321 IOThread::Globals* globals, 322 IOThread::Globals* globals,
322 const net::HttpNetworkSession::Params& params, 323 const net::HttpNetworkSession::Params& params,
323 net::NetLog* net_log); 324 net::NetLog* net_log);
324 325
325 // The NetLog is owned by the browser process, to allow logging from other 326 // The NetLog is owned by the browser process, to allow logging from other
326 // threads during shutdown, but is used most frequently on the IOThread. 327 // threads during shutdown, but is used most frequently on the IOThread.
327 net_log::ChromeNetLog* net_log_; 328 net_log::ChromeNetLog* net_log_;
328 329
329 #if defined(ENABLE_EXTENSIONS) 330 #if BUILDFLAG(ENABLE_EXTENSIONS)
330 // The extensions::EventRouterForwarder allows for sending events to 331 // The extensions::EventRouterForwarder allows for sending events to
331 // extensions from the IOThread. 332 // extensions from the IOThread.
332 extensions::EventRouterForwarder* extension_event_router_forwarder_; 333 extensions::EventRouterForwarder* extension_event_router_forwarder_;
333 #endif 334 #endif
334 335
335 // These member variables are basically global, but their lifetimes are tied 336 // These member variables are basically global, but their lifetimes are tied
336 // to the IOThread. IOThread owns them all, despite not using scoped_ptr. 337 // to the IOThread. IOThread owns them all, despite not using scoped_ptr.
337 // This is because the destructor of IOThread runs on the wrong thread. All 338 // This is because the destructor of IOThread runs on the wrong thread. All
338 // member variables should be deleted in CleanUp(). 339 // member variables should be deleted in CleanUp().
339 340
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 // Callback for updating data use prefs which needs to be initialized on UI 402 // Callback for updating data use prefs which needs to be initialized on UI
402 // thread and passed to |ChromeNetworkDelegate|. 403 // thread and passed to |ChromeNetworkDelegate|.
403 metrics::UpdateUsagePrefCallbackType metrics_data_use_forwarder_; 404 metrics::UpdateUsagePrefCallbackType metrics_data_use_forwarder_;
404 405
405 base::WeakPtrFactory<IOThread> weak_factory_; 406 base::WeakPtrFactory<IOThread> weak_factory_;
406 407
407 DISALLOW_COPY_AND_ASSIGN(IOThread); 408 DISALLOW_COPY_AND_ASSIGN(IOThread);
408 }; 409 };
409 410
410 #endif // CHROME_BROWSER_IO_THREAD_H_ 411 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « chrome/browser/interstitials/chrome_metrics_helper.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698