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

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

Issue 10682007: Move PendingExtensionManager and PendingExtensionInfo into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest master for cq 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 ba17841c743a37b9bcc5953b625b3b2402eb2918..b4f927a3d6e276d662c5977cd4a6e4d33219b5a0 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -425,7 +425,8 @@ const ExtensionSet* ExtensionService::GenerateInstalledExtensionsSet() const {
return installed_extensions;
}
-PendingExtensionManager* ExtensionService::pending_extension_manager() {
+extensions::PendingExtensionManager*
+ ExtensionService::pending_extension_manager() {
return &pending_extension_manager_;
}
@@ -554,7 +555,7 @@ bool ExtensionService::UpdateExtension(
CrxInstaller** out_crx_installer) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- const PendingExtensionInfo* pending_extension_info =
+ const extensions::PendingExtensionInfo* pending_extension_info =
pending_extension_manager()->GetById(id);
const Extension* extension =
@@ -2103,7 +2104,7 @@ void ExtensionService::OnExtensionInstalled(
bool initial_enable =
!extension_prefs_->IsExtensionDisabled(id) ||
system_->management_policy()->MustRemainEnabled(extension, NULL);
- const PendingExtensionInfo* pending_extension_info = NULL;
+ const extensions::PendingExtensionInfo* pending_extension_info = NULL;
if ((pending_extension_info = pending_extension_manager()->GetById(id))) {
if (!pending_extension_info->ShouldAllowInstall(*extension)) {
pending_extension_manager()->Remove(id);
« 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