OLD | NEW |
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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 // Clean up all DB files/directories | 267 // Clean up all DB files/directories |
268 if (db_tracker_) | 268 if (db_tracker_) |
269 BrowserThread::PostTask( | 269 BrowserThread::PostTask( |
270 BrowserThread::FILE, FROM_HERE, | 270 BrowserThread::FILE, FROM_HERE, |
271 NewRunnableMethod( | 271 NewRunnableMethod( |
272 db_tracker_.get(), | 272 db_tracker_.get(), |
273 &webkit_database::DatabaseTracker::DeleteIncognitoDBDirectory)); | 273 &webkit_database::DatabaseTracker::DeleteIncognitoDBDirectory)); |
274 | 274 |
275 BrowserList::RemoveObserver(this); | 275 BrowserList::RemoveObserver(this); |
276 | 276 |
| 277 if (host_content_settings_map_) |
| 278 host_content_settings_map_->ShutdownOnUIThread(); |
| 279 |
277 if (pref_proxy_config_tracker_) | 280 if (pref_proxy_config_tracker_) |
278 pref_proxy_config_tracker_->DetachFromPrefService(); | 281 pref_proxy_config_tracker_->DetachFromPrefService(); |
279 | 282 |
280 ExtensionService* extension_service = GetExtensionService(); | 283 ExtensionService* extension_service = GetExtensionService(); |
281 if (extension_service) { | 284 if (extension_service) { |
282 ExtensionPrefs* extension_prefs = extension_service->extension_prefs(); | 285 ExtensionPrefs* extension_prefs = extension_service->extension_prefs(); |
283 extension_prefs->ClearIncognitoSessionOnlyContentSettings(); | 286 extension_prefs->ClearIncognitoSessionOnlyContentSettings(); |
284 } | 287 } |
285 } | 288 } |
286 | 289 |
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
847 }; | 850 }; |
848 #endif | 851 #endif |
849 | 852 |
850 Profile* Profile::CreateOffTheRecordProfile() { | 853 Profile* Profile::CreateOffTheRecordProfile() { |
851 #if defined(OS_CHROMEOS) | 854 #if defined(OS_CHROMEOS) |
852 if (Profile::IsGuestSession()) | 855 if (Profile::IsGuestSession()) |
853 return new GuestSessionProfile(this); | 856 return new GuestSessionProfile(this); |
854 #endif | 857 #endif |
855 return new OffTheRecordProfileImpl(this); | 858 return new OffTheRecordProfileImpl(this); |
856 } | 859 } |
OLD | NEW |