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

Side by Side Diff: chrome/browser/profiles/profile.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
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.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 } 509 }
510 510
511 virtual net::SSLConfigService* GetSSLConfigService() { 511 virtual net::SSLConfigService* GetSSLConfigService() {
512 return profile_->GetSSLConfigService(); 512 return profile_->GetSSLConfigService();
513 } 513 }
514 514
515 virtual HostContentSettingsMap* GetHostContentSettingsMap() { 515 virtual HostContentSettingsMap* GetHostContentSettingsMap() {
516 // Retrieve the host content settings map of the parent profile in order to 516 // Retrieve the host content settings map of the parent profile in order to
517 // ensure the preferences have been migrated. 517 // ensure the preferences have been migrated.
518 profile_->GetHostContentSettingsMap(); 518 profile_->GetHostContentSettingsMap();
519 if (!host_content_settings_map_.get()) 519 if (!host_content_settings_map_.get()) {
520 host_content_settings_map_ = new HostContentSettingsMap(this); 520 host_content_settings_map_ = new HostContentSettingsMap(
521 GetPrefs(), GetExtensionService(), true);
522 }
521 return host_content_settings_map_.get(); 523 return host_content_settings_map_.get();
522 } 524 }
523 525
524 virtual HostZoomMap* GetHostZoomMap() { 526 virtual HostZoomMap* GetHostZoomMap() {
525 if (!host_zoom_map_) 527 if (!host_zoom_map_)
526 host_zoom_map_ = new HostZoomMap(); 528 host_zoom_map_ = new HostZoomMap();
527 return host_zoom_map_.get(); 529 return host_zoom_map_.get();
528 } 530 }
529 531
530 virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() { 532 virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() {
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 }; 853 };
852 #endif 854 #endif
853 855
854 Profile* Profile::CreateOffTheRecordProfile() { 856 Profile* Profile::CreateOffTheRecordProfile() {
855 #if defined(OS_CHROMEOS) 857 #if defined(OS_CHROMEOS)
856 if (Profile::IsGuestSession()) 858 if (Profile::IsGuestSession())
857 return new GuestSessionProfile(this); 859 return new GuestSessionProfile(this);
858 #endif 860 #endif
859 return new OffTheRecordProfileImpl(this); 861 return new OffTheRecordProfileImpl(this);
860 } 862 }
OLDNEW
« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map_unittest.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698