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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 10704023: Moved ExtensionPrefs and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master merged in 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 45f5c576a3dded3012c1b5ede32071082c9d2acc..8cc4bb17e8a4647aacd4fb6634e3311226b9088e 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -322,7 +322,7 @@ bool ExtensionService::UninstallExtensionHelper(
ExtensionService::ExtensionService(Profile* profile,
const CommandLine* command_line,
const FilePath& install_directory,
- ExtensionPrefs* extension_prefs,
+ extensions::ExtensionPrefs* extension_prefs,
bool autoupdate_enabled,
bool extensions_enabled)
: profile_(profile),
@@ -1139,7 +1139,7 @@ Profile* ExtensionService::profile() {
return profile_;
}
-ExtensionPrefs* ExtensionService::extension_prefs() {
+extensions::ExtensionPrefs* ExtensionService::extension_prefs() {
return extension_prefs_;
}
@@ -1686,7 +1686,7 @@ void ExtensionService::OnAllExternalProvidersReady() {
}
// Uninstall all the unclaimed extensions.
- scoped_ptr<ExtensionPrefs::ExtensionsInfo> extensions_info(
+ scoped_ptr<extensions::ExtensionPrefs::ExtensionsInfo> extensions_info(
extension_prefs_->GetInstalledExtensionsInfo());
for (size_t i = 0; i < extensions_info->size(); ++i) {
ExtensionInfo* info = extensions_info->at(i).get();
@@ -1858,7 +1858,7 @@ void ExtensionService::GarbageCollectExtensions() {
if (extension_prefs_->pref_service()->ReadOnly())
return;
- scoped_ptr<ExtensionPrefs::ExtensionsInfo> info(
+ scoped_ptr<extensions::ExtensionPrefs::ExtensionsInfo> info(
extension_prefs_->GetInstalledExtensionsInfo());
std::map<std::string, FilePath> extension_paths;
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698