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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.h
===================================================================
--- chrome/browser/profiles/profile_io_data.h (revision 122827)
+++ chrome/browser/profiles/profile_io_data.h (working copy)
@@ -141,7 +141,6 @@
AudioManager* audio_manager;
scoped_refptr<HostContentSettingsMap> host_content_settings_map;
scoped_refptr<CookieSettings> cookie_settings;
- scoped_refptr<content::HostZoomMap> host_zoom_map;
scoped_refptr<net::SSLConfigService> ssl_config_service;
scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
scoped_refptr<WebKitContext> webkit_context;
@@ -219,7 +218,6 @@
// ResourceContext implementation:
virtual net::HostResolver* GetHostResolver() OVERRIDE;
virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
- virtual content::HostZoomMap* GetHostZoomMap() OVERRIDE;
virtual MediaObserver* GetMediaObserver() OVERRIDE;
virtual media_stream::MediaStreamManager* GetMediaStreamManager() OVERRIDE;
virtual AudioManager* GetAudioManager() OVERRIDE;
@@ -230,7 +228,6 @@
net::HostResolver* host_resolver_;
net::URLRequestContext* request_context_;
- content::HostZoomMap* host_zoom_map_;
MediaObserver* media_observer_;
media_stream::MediaStreamManager* media_stream_manager_;
AudioManager* audio_manager_;
@@ -290,7 +287,6 @@
mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;
// Pointed to by ResourceContext.
- mutable scoped_refptr<content::HostZoomMap> host_zoom_map_;
mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
// TODO(willchan): Remove from ResourceContext.
« 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