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

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

Issue 1320533007: Componentize ssl_config_service_manager_pref.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve -Wnewline-eof mac_chromium bot failure Created 5 years, 2 months 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/chromeos/mobile/mobile_activator.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 <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
18 #include "base/prefs/pref_member.h" 18 #include "base/prefs/pref_member.h"
19 #include "base/strings/string_piece.h" 19 #include "base/strings/string_piece.h"
20 #include "base/time/time.h" 20 #include "base/time/time.h"
21 #include "chrome/browser/net/chrome_network_delegate.h" 21 #include "chrome/browser/net/chrome_network_delegate.h"
22 #include "chrome/browser/net/ssl_config_service_manager.h"
23 #include "components/data_usage/core/data_use_aggregator.h" 22 #include "components/data_usage/core/data_use_aggregator.h"
23 #include "components/ssl_config/ssl_config_service_manager.h"
24 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
25 #include "content/public/browser/browser_thread_delegate.h" 25 #include "content/public/browser/browser_thread_delegate.h"
26 #include "net/base/network_change_notifier.h" 26 #include "net/base/network_change_notifier.h"
27 #include "net/http/http_network_session.h" 27 #include "net/http/http_network_session.h"
28 #include "net/socket/next_proto.h" 28 #include "net/socket/next_proto.h"
29 29
30 class PrefProxyConfigTracker; 30 class PrefProxyConfigTracker;
31 class PrefService; 31 class PrefService;
32 class PrefRegistrySimple; 32 class PrefRegistrySimple;
33 class SystemURLRequestContextGetter; 33 class SystemURLRequestContextGetter;
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 std::string auth_schemes_; 489 std::string auth_schemes_;
490 bool negotiate_disable_cname_lookup_; 490 bool negotiate_disable_cname_lookup_;
491 bool negotiate_enable_port_; 491 bool negotiate_enable_port_;
492 std::string auth_server_whitelist_; 492 std::string auth_server_whitelist_;
493 std::string auth_delegate_whitelist_; 493 std::string auth_delegate_whitelist_;
494 std::string gssapi_library_name_; 494 std::string gssapi_library_name_;
495 std::string auth_android_negotiate_account_type_; 495 std::string auth_android_negotiate_account_type_;
496 496
497 // This is an instance of the default SSLConfigServiceManager for the current 497 // This is an instance of the default SSLConfigServiceManager for the current
498 // platform and it gets SSL preferences from local_state object. 498 // platform and it gets SSL preferences from local_state object.
499 scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_; 499 scoped_ptr<ssl_config::SSLConfigServiceManager> ssl_config_service_manager_;
500 500
501 // These member variables are initialized by a task posted to the IO thread, 501 // These member variables are initialized by a task posted to the IO thread,
502 // which gets posted by calling certain member functions of IOThread. 502 // which gets posted by calling certain member functions of IOThread.
503 scoped_ptr<net::ProxyConfigService> system_proxy_config_service_; 503 scoped_ptr<net::ProxyConfigService> system_proxy_config_service_;
504 504
505 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 505 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
506 506
507 scoped_refptr<net::URLRequestContextGetter> 507 scoped_refptr<net::URLRequestContextGetter>
508 system_url_request_context_getter_; 508 system_url_request_context_getter_;
509 509
(...skipping 11 matching lines...) Expand all
521 external_data_use_observer_; 521 external_data_use_observer_;
522 522
523 const base::TimeTicks creation_time_; 523 const base::TimeTicks creation_time_;
524 524
525 base::WeakPtrFactory<IOThread> weak_factory_; 525 base::WeakPtrFactory<IOThread> weak_factory_;
526 526
527 DISALLOW_COPY_AND_ASSIGN(IOThread); 527 DISALLOW_COPY_AND_ASSIGN(IOThread);
528 }; 528 };
529 529
530 #endif // CHROME_BROWSER_IO_THREAD_H_ 530 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/mobile/mobile_activator.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698