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

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

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Deal with comments and build and test failures. Created 5 years, 6 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
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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 452
453 BooleanPrefMember quick_check_enabled_; 453 BooleanPrefMember quick_check_enabled_;
454 454
455 // Store HTTP Auth-related policies in this thread. 455 // Store HTTP Auth-related policies in this thread.
456 std::string auth_schemes_; 456 std::string auth_schemes_;
457 bool negotiate_disable_cname_lookup_; 457 bool negotiate_disable_cname_lookup_;
458 bool negotiate_enable_port_; 458 bool negotiate_enable_port_;
459 std::string auth_server_whitelist_; 459 std::string auth_server_whitelist_;
460 std::string auth_delegate_whitelist_; 460 std::string auth_delegate_whitelist_;
461 std::string gssapi_library_name_; 461 std::string gssapi_library_name_;
462 std::string auth_android_negotiate_account_type_;
462 463
463 // This is an instance of the default SSLConfigServiceManager for the current 464 // This is an instance of the default SSLConfigServiceManager for the current
464 // platform and it gets SSL preferences from local_state object. 465 // platform and it gets SSL preferences from local_state object.
465 scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_; 466 scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
466 467
467 // These member variables are initialized by a task posted to the IO thread, 468 // These member variables are initialized by a task posted to the IO thread,
468 // which gets posted by calling certain member functions of IOThread. 469 // which gets posted by calling certain member functions of IOThread.
469 scoped_ptr<net::ProxyConfigService> system_proxy_config_service_; 470 scoped_ptr<net::ProxyConfigService> system_proxy_config_service_;
470 471
471 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 472 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
472 473
473 scoped_refptr<net::URLRequestContextGetter> 474 scoped_refptr<net::URLRequestContextGetter>
474 system_url_request_context_getter_; 475 system_url_request_context_getter_;
475 476
476 // True if SPDY is disabled by policy. 477 // True if SPDY is disabled by policy.
477 bool is_spdy_disabled_by_policy_; 478 bool is_spdy_disabled_by_policy_;
478 479
479 // True if QUIC is allowed by policy. 480 // True if QUIC is allowed by policy.
480 bool is_quic_allowed_by_policy_; 481 bool is_quic_allowed_by_policy_;
481 482
482 const base::TimeTicks creation_time_; 483 const base::TimeTicks creation_time_;
483 484
484 base::WeakPtrFactory<IOThread> weak_factory_; 485 base::WeakPtrFactory<IOThread> weak_factory_;
485 486
486 DISALLOW_COPY_AND_ASSIGN(IOThread); 487 DISALLOW_COPY_AND_ASSIGN(IOThread);
487 }; 488 };
488 489
489 #endif // CHROME_BROWSER_IO_THREAD_H_ 490 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698