summaryrefslogtreecommitdiffstats
path: root/ios/public
diff options
context:
space:
mode:
authordroger <droger@chromium.org>2015-12-10 09:48:39 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-10 17:49:24 +0000
commit7fbc7a27199c559d07f7a4a6da745a0e712e8d68 (patch)
tree7a3dc939278313fcaa127003963d9127464bf47d /ios/public
parent972507434589250e845a8c38a0d220eb3d5aed5c (diff)
downloadchromium_src-7fbc7a27199c559d07f7a4a6da745a0e712e8d68.zip
chromium_src-7fbc7a27199c559d07f7a4a6da745a0e712e8d68.tar.gz
chromium_src-7fbc7a27199c559d07f7a4a6da745a0e712e8d68.tar.bz2
Upstream ChromeBrowserStateIOData and related classes.
BUG=560816 Review URL: https://codereview.chromium.org/1515613002 Cr-Commit-Position: refs/heads/master@{#364393}
Diffstat (limited to 'ios/public')
-rw-r--r--ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h17
1 files changed, 17 insertions, 0 deletions
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() {}