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

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 7218073: Explicitly ShutdownOnUIThread the HostContentSettingsMap when destroying the Profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 5 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.cc ('k') | chrome/test/testing_profile.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 &ExtensionInfoMap::RemoveExtension, 939 &ExtensionInfoMap::RemoveExtension,
940 extension_id, 940 extension_id,
941 reason)); 941 reason));
942 } 942 }
943 943
944 net::SSLConfigService* ProfileImpl::GetSSLConfigService() { 944 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
945 return ssl_config_service_manager_->Get(); 945 return ssl_config_service_manager_->Get();
946 } 946 }
947 947
948 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { 948 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
949 if (!host_content_settings_map_.get()) 949 if (!host_content_settings_map_.get()) {
950 host_content_settings_map_ = new HostContentSettingsMap(this); 950 host_content_settings_map_ = new HostContentSettingsMap(
951 GetPrefs(), GetExtensionService(), false);
952 }
951 return host_content_settings_map_.get(); 953 return host_content_settings_map_.get();
952 } 954 }
953 955
954 HostZoomMap* ProfileImpl::GetHostZoomMap() { 956 HostZoomMap* ProfileImpl::GetHostZoomMap() {
955 if (!host_zoom_map_) { 957 if (!host_zoom_map_) {
956 host_zoom_map_ = new HostZoomMap(); 958 host_zoom_map_ = new HostZoomMap();
957 host_zoom_map_->set_default_zoom_level( 959 host_zoom_map_->set_default_zoom_level(
958 GetPrefs()->GetDouble(prefs::kDefaultZoomLevel)); 960 GetPrefs()->GetDouble(prefs::kDefaultZoomLevel));
959 961
960 const DictionaryValue* host_zoom_dictionary = 962 const DictionaryValue* host_zoom_dictionary =
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
1648 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1650 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1649 return NULL; 1651 return NULL;
1650 if (!prerender_manager_.get()) { 1652 if (!prerender_manager_.get()) {
1651 CHECK(g_browser_process->prerender_tracker()); 1653 CHECK(g_browser_process->prerender_tracker());
1652 prerender_manager_.reset( 1654 prerender_manager_.reset(
1653 new prerender::PrerenderManager( 1655 new prerender::PrerenderManager(
1654 this, g_browser_process->prerender_tracker())); 1656 this, g_browser_process->prerender_tracker()));
1655 } 1657 }
1656 return prerender_manager_.get(); 1658 return prerender_manager_.get();
1657 } 1659 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/test/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698