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

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

Issue 7275018: Make ExtensionContentSettingsStore refcounted. (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') | no next file » | 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 643 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 654
655 if (extension_message_service_) 655 if (extension_message_service_)
656 extension_message_service_->DestroyingProfile(); 656 extension_message_service_->DestroyingProfile();
657 657
658 if (pref_proxy_config_tracker_) 658 if (pref_proxy_config_tracker_)
659 pref_proxy_config_tracker_->DetachFromPrefService(); 659 pref_proxy_config_tracker_->DetachFromPrefService();
660 660
661 if (protocol_handler_registry_) 661 if (protocol_handler_registry_)
662 protocol_handler_registry_->Finalize(); 662 protocol_handler_registry_->Finalize();
663 663
664 if (host_content_settings_map_)
665 host_content_settings_map_->ShutdownOnUIThread();
666
664 // This causes the Preferences file to be written to disk. 667 // This causes the Preferences file to be written to disk.
665 MarkAsCleanShutdown(); 668 MarkAsCleanShutdown();
666 } 669 }
667 670
668 std::string ProfileImpl::GetProfileName() { 671 std::string ProfileImpl::GetProfileName() {
669 return GetPrefs()->GetString(prefs::kGoogleServicesUsername); 672 return GetPrefs()->GetString(prefs::kGoogleServicesUsername);
670 } 673 }
671 674
672 ProfileId ProfileImpl::GetRuntimeId() { 675 ProfileId ProfileImpl::GetRuntimeId() {
673 return reinterpret_cast<ProfileId>(this); 676 return reinterpret_cast<ProfileId>(this);
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1635 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1633 return NULL; 1636 return NULL;
1634 if (!prerender_manager_.get()) { 1637 if (!prerender_manager_.get()) {
1635 CHECK(g_browser_process->prerender_tracker()); 1638 CHECK(g_browser_process->prerender_tracker());
1636 prerender_manager_.reset( 1639 prerender_manager_.reset(
1637 new prerender::PrerenderManager( 1640 new prerender::PrerenderManager(
1638 this, g_browser_process->prerender_tracker())); 1641 this, g_browser_process->prerender_tracker()));
1639 } 1642 }
1640 return prerender_manager_.get(); 1643 return prerender_manager_.get();
1641 } 1644 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698