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

Side by Side Diff: chrome/browser/profiles/profile_io_data.h

Issue 9416070: Move creation and ownership of HostZoomMap to content instead of having every embedder do this. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac/cros browsertests Created 8 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_PROFILES_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 FilePath path; 134 FilePath path;
135 bool is_incognito; 135 bool is_incognito;
136 bool clear_local_state_on_exit; 136 bool clear_local_state_on_exit;
137 std::string accept_language; 137 std::string accept_language;
138 std::string accept_charset; 138 std::string accept_charset;
139 std::string referrer_charset; 139 std::string referrer_charset;
140 IOThread* io_thread; 140 IOThread* io_thread;
141 AudioManager* audio_manager; 141 AudioManager* audio_manager;
142 scoped_refptr<HostContentSettingsMap> host_content_settings_map; 142 scoped_refptr<HostContentSettingsMap> host_content_settings_map;
143 scoped_refptr<CookieSettings> cookie_settings; 143 scoped_refptr<CookieSettings> cookie_settings;
144 scoped_refptr<content::HostZoomMap> host_zoom_map;
145 scoped_refptr<net::SSLConfigService> ssl_config_service; 144 scoped_refptr<net::SSLConfigService> ssl_config_service;
146 scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate; 145 scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
147 scoped_refptr<WebKitContext> webkit_context; 146 scoped_refptr<WebKitContext> webkit_context;
148 scoped_refptr<ExtensionInfoMap> extension_info_map; 147 scoped_refptr<ExtensionInfoMap> extension_info_map;
149 DesktopNotificationService* notification_service; 148 DesktopNotificationService* notification_service;
150 scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry; 149 scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry;
151 // We need to initialize the ProxyConfigService from the UI thread 150 // We need to initialize the ProxyConfigService from the UI thread
152 // because on linux it relies on initializing things through gconf, 151 // because on linux it relies on initializing things through gconf,
153 // and needs to be on the main thread. 152 // and needs to be on the main thread.
154 scoped_ptr<net::ProxyConfigService> proxy_config_service; 153 scoped_ptr<net::ProxyConfigService> proxy_config_service;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 public: 211 public:
213 explicit ResourceContext(ProfileIOData* io_data); 212 explicit ResourceContext(ProfileIOData* io_data);
214 virtual ~ResourceContext(); 213 virtual ~ResourceContext();
215 214
216 private: 215 private:
217 friend class ProfileIOData; 216 friend class ProfileIOData;
218 217
219 // ResourceContext implementation: 218 // ResourceContext implementation:
220 virtual net::HostResolver* GetHostResolver() OVERRIDE; 219 virtual net::HostResolver* GetHostResolver() OVERRIDE;
221 virtual net::URLRequestContext* GetRequestContext() OVERRIDE; 220 virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
222 virtual content::HostZoomMap* GetHostZoomMap() OVERRIDE;
223 virtual MediaObserver* GetMediaObserver() OVERRIDE; 221 virtual MediaObserver* GetMediaObserver() OVERRIDE;
224 virtual media_stream::MediaStreamManager* GetMediaStreamManager() OVERRIDE; 222 virtual media_stream::MediaStreamManager* GetMediaStreamManager() OVERRIDE;
225 virtual AudioManager* GetAudioManager() OVERRIDE; 223 virtual AudioManager* GetAudioManager() OVERRIDE;
226 224
227 void EnsureInitialized(); 225 void EnsureInitialized();
228 226
229 ProfileIOData* const io_data_; 227 ProfileIOData* const io_data_;
230 228
231 net::HostResolver* host_resolver_; 229 net::HostResolver* host_resolver_;
232 net::URLRequestContext* request_context_; 230 net::URLRequestContext* request_context_;
233 content::HostZoomMap* host_zoom_map_;
234 MediaObserver* media_observer_; 231 MediaObserver* media_observer_;
235 media_stream::MediaStreamManager* media_stream_manager_; 232 media_stream::MediaStreamManager* media_stream_manager_;
236 AudioManager* audio_manager_; 233 AudioManager* audio_manager_;
237 }; 234 };
238 235
239 typedef base::hash_map<std::string, scoped_refptr<ChromeURLRequestContext> > 236 typedef base::hash_map<std::string, scoped_refptr<ChromeURLRequestContext> >
240 AppRequestContextMap; 237 AppRequestContextMap;
241 238
242 // -------------------------------------------- 239 // --------------------------------------------
243 // Virtual interface for subtypes to implement: 240 // Virtual interface for subtypes to implement:
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 chrome_url_data_manager_backend_; 280 chrome_url_data_manager_backend_;
284 mutable scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service_; 281 mutable scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service_;
285 mutable scoped_ptr<net::NetworkDelegate> network_delegate_; 282 mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
286 mutable scoped_ptr<net::FraudulentCertificateReporter> 283 mutable scoped_ptr<net::FraudulentCertificateReporter>
287 fraudulent_certificate_reporter_; 284 fraudulent_certificate_reporter_;
288 mutable scoped_ptr<net::ProxyService> proxy_service_; 285 mutable scoped_ptr<net::ProxyService> proxy_service_;
289 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 286 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
290 mutable scoped_ptr<net::URLRequestJobFactory> job_factory_; 287 mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;
291 288
292 // Pointed to by ResourceContext. 289 // Pointed to by ResourceContext.
293 mutable scoped_refptr<content::HostZoomMap> host_zoom_map_;
294 mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_; 290 mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
295 291
296 // TODO(willchan): Remove from ResourceContext. 292 // TODO(willchan): Remove from ResourceContext.
297 mutable scoped_refptr<ExtensionInfoMap> extension_info_map_; 293 mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
298 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 294 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
299 mutable scoped_refptr<CookieSettings> cookie_settings_; 295 mutable scoped_refptr<CookieSettings> cookie_settings_;
300 mutable DesktopNotificationService* notification_service_; 296 mutable DesktopNotificationService* notification_service_;
301 297
302 mutable ResourceContext resource_context_; 298 mutable ResourceContext resource_context_;
303 299
304 mutable scoped_ptr<TransportSecurityPersister> 300 mutable scoped_ptr<TransportSecurityPersister>
305 transport_security_persister_; 301 transport_security_persister_;
306 302
307 // These are only valid in between LazyInitialize() and their accessor being 303 // These are only valid in between LazyInitialize() and their accessor being
308 // called. 304 // called.
309 mutable scoped_refptr<ChromeURLRequestContext> main_request_context_; 305 mutable scoped_refptr<ChromeURLRequestContext> main_request_context_;
310 mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_; 306 mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_;
311 // One AppRequestContext per isolated app. 307 // One AppRequestContext per isolated app.
312 mutable AppRequestContextMap app_request_context_map_; 308 mutable AppRequestContextMap app_request_context_map_;
313 309
314 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 310 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
315 bool initialized_on_UI_thread_; 311 bool initialized_on_UI_thread_;
316 312
317 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 313 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
318 }; 314 };
319 315
320 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 316 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698