From 7fbc7a27199c559d07f7a4a6da745a0e712e8d68 Mon Sep 17 00:00:00 2001 From: droger Date: Thu, 10 Dec 2015 09:48:39 -0800 Subject: Upstream ChromeBrowserStateIOData and related classes. BUG=560816 Review URL: https://codereview.chromium.org/1515613002 Cr-Commit-Position: refs/heads/master@{#364393} --- .../chrome/browser/browser_state/chrome_browser_state.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'ios/public') diff --git a/ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h b/ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h index ab7be32..bdb1374 100644 --- a/ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h +++ b/ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h @@ -13,6 +13,7 @@ #include "base/memory/ref_counted.h" #include "ios/web/public/browser_state.h" +class PrefProxyConfigTracker; class PrefService; namespace base { @@ -20,6 +21,10 @@ class SequencedTaskRunner; class Time; } +namespace net { +class SSLConfigService; +} + namespace syncable_prefs { class PrefServiceSyncable; } @@ -30,6 +35,11 @@ class WebUIIOS; namespace ios { +enum class ChromeBrowserStateType { + REGULAR_BROWSER_STATE, + INCOGNITO_BROWSER_STATE, +}; + // This class is a Chrome-specific extension of the BrowserState interface. class ChromeBrowserState : public web::BrowserState { public: @@ -84,6 +94,13 @@ class ChromeBrowserState : public web::BrowserState { // Returns an identifier of the browser state for debugging. std::string GetDebugName(); + // Returns the helper object that provides the proxy configuration service + // access to the the proxy configuration possibly defined by preferences. + virtual PrefProxyConfigTracker* GetProxyConfigTracker() = 0; + + // Returns the SSLConfigService for this browser state. + virtual net::SSLConfigService* GetSSLConfigService() = 0; + protected: ChromeBrowserState() {} -- cgit v1.1