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

Unified Diff: chrome/browser/profiles/profile_io_data.h

Issue 10918279: Provide mutable members of UrlRequestContext via pure-virtual interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: const-ify HUAS getters Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index f9c8a887ecc369658f36e79184c6c083f391b1ec..3665369fcb7f885ecb1ee9cbca7d9b0664120068 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -22,6 +22,7 @@
#include "net/http/http_network_session.h"
#include "net/url_request/url_request_job_factory.h"
+class ChromeHttpUserAgentSettings;
class CookieSettings;
class DesktopNotificationService;
class ExtensionInfoMap;
@@ -184,8 +185,6 @@ class ProfileIOData {
~ProfileParams();
FilePath path;
- std::string accept_language;
- std::string accept_charset;
IOThread* io_thread;
scoped_refptr<CookieSettings> cookie_settings;
scoped_refptr<net::SSLConfigService> ssl_config_service;
@@ -209,6 +208,9 @@ class ProfileIOData {
// because on linux it relies on initializing things through gconf,
// and needs to be on the main thread.
scoped_ptr<net::ProxyConfigService> proxy_config_service;
+ // We need to initialize the ChromeHttpUserAgentSettings on the UI thread
+ // so it can sign up for notifications from the PrefService.
+ scoped_ptr<ChromeHttpUserAgentSettings> chrome_http_user_agent_settings;
// The profile this struct was populated from. It's passed as a void* to
// ensure it's not accidently used on the IO thread. Before using it on the
// UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
@@ -424,6 +426,9 @@ class ProfileIOData {
mutable scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver>
resource_prefetch_predictor_observer_;
+ mutable scoped_ptr<ChromeHttpUserAgentSettings>
+ chrome_http_user_agent_settings_;
+
mutable chrome_browser_net::LoadTimeStats* load_time_stats_;
// TODO(jhawkins): Remove once crbug.com/102004 is fixed.

Powered by Google App Engine
This is Rietveld 408576698