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

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

Issue 10626007: Move ExtensionSystem into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Master merge; moved class declaration Created 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <set> 5 #include <set>
6 6
7 #include "chrome/browser/profiles/profile_manager.h" 7 #include "chrome/browser/profiles/profile_manager.h"
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 content::NotificationService::current()->Notify( 652 content::NotificationService::current()->Notify(
653 chrome::NOTIFICATION_PROFILE_ADDED, 653 chrome::NOTIFICATION_PROFILE_ADDED,
654 content::Source<Profile>(profile), 654 content::Source<Profile>(profile),
655 content::NotificationService::NoDetails()); 655 content::NotificationService::NoDetails());
656 656
657 } 657 }
658 658
659 void ProfileManager::DoFinalInitForServices(Profile* profile, 659 void ProfileManager::DoFinalInitForServices(Profile* profile,
660 bool go_off_the_record) { 660 bool go_off_the_record) {
661 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 661 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
662 ExtensionSystem::Get(profile)->Init(!go_off_the_record); 662 extensions::ExtensionSystem::Get(profile)->Init(!go_off_the_record);
663 // During tests, when |profile| is an instance of TestingProfile, 663 // During tests, when |profile| is an instance of TestingProfile,
664 // ExtensionSystem might not create an ExtensionService. 664 // ExtensionSystem might not create an ExtensionService.
665 if (ExtensionSystem::Get(profile)->extension_service()) { 665 if (extensions::ExtensionSystem::Get(profile)->extension_service()) {
666 profile->GetHostContentSettingsMap()->RegisterExtensionService( 666 profile->GetHostContentSettingsMap()->RegisterExtensionService(
667 ExtensionSystem::Get(profile)->extension_service()); 667 extensions::ExtensionSystem::Get(profile)->extension_service());
668 } 668 }
669 if (!command_line.HasSwitch(switches::kDisableWebResources)) 669 if (!command_line.HasSwitch(switches::kDisableWebResources))
670 profile->InitPromoResources(); 670 profile->InitPromoResources();
671 } 671 }
672 672
673 void ProfileManager::DoFinalInitLogging(Profile* profile) { 673 void ProfileManager::DoFinalInitLogging(Profile* profile) {
674 // Count number of extensions in this profile. 674 // Count number of extensions in this profile.
675 int extension_count = -1; 675 int extension_count = -1;
676 ExtensionService* extension_service = profile->GetExtensionService(); 676 ExtensionService* extension_service = profile->GetExtensionService();
677 if (extension_service) 677 if (extension_service)
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1000 void ProfileManager::RunCallbacks(const std::vector<CreateCallback>& callbacks, 1000 void ProfileManager::RunCallbacks(const std::vector<CreateCallback>& callbacks,
1001 Profile* profile, 1001 Profile* profile,
1002 Profile::CreateStatus status) { 1002 Profile::CreateStatus status) {
1003 for (size_t i = 0; i < callbacks.size(); ++i) 1003 for (size_t i = 0; i < callbacks.size(); ++i)
1004 callbacks[i].Run(profile, status); 1004 callbacks[i].Run(profile, status);
1005 } 1005 }
1006 1006
1007 ProfileManager::ProfileInfo::~ProfileInfo() { 1007 ProfileManager::ProfileInfo::~ProfileInfo() {
1008 ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release()); 1008 ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());
1009 } 1009 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/renderer_host/chrome_render_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698