summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.h
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-03 22:16:47 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-03 22:16:47 +0000
commit85ce42f1e8363a9578d1b857f5c58ce329ac0261 (patch)
tree1622a0af585bf4d30bf148c9230de5c50a6ae69b /chrome/browser/profile.h
parent6224d84baa38b40595d1c259edb9acd3c130e383 (diff)
downloadchromium_src-85ce42f1e8363a9578d1b857f5c58ce329ac0261.zip
chromium_src-85ce42f1e8363a9578d1b857f5c58ce329ac0261.tar.gz
chromium_src-85ce42f1e8363a9578d1b857f5c58ce329ac0261.tar.bz2
Reverting r25382: blame Windows
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.h')
-rw-r--r--chrome/browser/profile.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h
index 97e747b..83ae64c 100644
--- a/chrome/browser/profile.h
+++ b/chrome/browser/profile.h
@@ -34,7 +34,6 @@ class ExtensionProcessManager;
class ExtensionMessageService;
class ExtensionsService;
class FaviconService;
-class ForceTLSPersister;
class HistoryService;
class NavigationController;
class PasswordStore;
@@ -155,7 +154,7 @@ class Profile {
// called.
virtual SSLHostState* GetSSLHostState() = 0;
- // Retrieves a pointer to the ForceTLSState associated with this profile.
+ // Retrieves a pointer to the ForceTLStSate associated with this profile.
// The ForceTLSState is lazily created the first time that this method is
// called.
virtual net::ForceTLSState* GetForceTLSState() = 0;
@@ -461,8 +460,7 @@ class ProfileImpl : public Profile,
scoped_ptr<ExtensionProcessManager> extension_process_manager_;
scoped_refptr<ExtensionMessageService> extension_message_service_;
scoped_ptr<SSLHostState> ssl_host_state_;
- scoped_refptr<net::ForceTLSState> force_tls_state_;
- scoped_refptr<ForceTLSPersister> force_tls_persister_;
+ scoped_ptr<net::ForceTLSState> force_tls_state_;
scoped_ptr<PrefService> prefs_;
scoped_refptr<ThumbnailStore> thumbnail_store_;
scoped_ptr<TemplateURLFetcher> template_url_fetcher_;