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

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

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
Index: chrome/browser/profiles/profile_io_data.cc
===================================================================
--- chrome/browser/profiles/profile_io_data.cc (revision 122827)
+++ chrome/browser/profiles/profile_io_data.cc (working copy)
@@ -220,7 +220,6 @@
params->host_content_settings_map = profile->GetHostContentSettingsMap();
params->cookie_settings = CookieSettings::Factory::GetForProfile(profile);
- params->host_zoom_map = profile->GetHostZoomMap();
params->ssl_config_service = profile->GetSSLConfigService();
base::Callback<Profile*(void)> profile_getter =
base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(),
@@ -413,12 +412,6 @@
return request_context_;
}
-content::HostZoomMap* ProfileIOData::ResourceContext::GetHostZoomMap() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- EnsureInitialized();
- return host_zoom_map_;
-}
-
MediaObserver* ProfileIOData::ResourceContext::GetMediaObserver() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
EnsureInitialized();
@@ -532,7 +525,6 @@
new media_stream::MediaStreamManager(profile_params_->audio_manager));
// Take ownership over these parameters.
- host_zoom_map_ = profile_params_->host_zoom_map;
host_content_settings_map_ = profile_params_->host_content_settings_map;
cookie_settings_ = profile_params_->cookie_settings;
notification_service_ = profile_params_->notification_service;
@@ -540,7 +532,6 @@
resource_context_.host_resolver_ = io_thread_globals->host_resolver.get();
resource_context_.request_context_ = main_request_context_;
- resource_context_.host_zoom_map_ = host_zoom_map_;
resource_context_.media_observer_ =
io_thread_globals->media.media_internals.get();
resource_context_.media_stream_manager_ = media_stream_manager_.get();
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698