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

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

Issue 300853008: Refactor external_install_ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 1a12f92bde374dc90c8ec54f34c9be017cbe7192..f81998d7fbe1ecfc896f4f06c1a8e2d99653553a 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -28,7 +28,7 @@
#include "chrome/browser/extensions/extension_special_storage_policy.h"
#include "chrome/browser/extensions/extension_sync_service.h"
#include "chrome/browser/extensions/extension_util.h"
-#include "chrome/browser/extensions/external_install_ui.h"
+#include "chrome/browser/extensions/external_install_manager.h"
#include "chrome/browser/extensions/external_provider_impl.h"
#include "chrome/browser/extensions/install_verifier.h"
#include "chrome/browser/extensions/installed_loader.h"
@@ -285,6 +285,8 @@ ExtensionService::ExtensionService(Profile* profile,
browser_terminating_(false),
installs_delayed_for_gc_(false),
is_first_run_(false),
+ external_install_manager_(
+ new extensions::ExternalInstallManager(profile_)),
shared_module_service_(new extensions::SharedModuleService(profile_)) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -1337,7 +1339,7 @@ void ExtensionService::UpdateExternalExtensionAlert() {
}
if (extension) {
- if (!extensions::HasExternalInstallError(this)) {
+ if (!external_install_manager_->HasExternalInstallError()) {
if (extension_prefs_->IncrementAcknowledgePromptCount(extension->id()) >
kMaxExtensionAcknowledgePromptCount) {
// Stop prompting for this extension, and check if there's another
@@ -1366,10 +1368,8 @@ void ExtensionService::UpdateExternalExtensionAlert() {
// (even if it's post-first run now).
bool first_run = extension_prefs_->IsExternalInstallFirstRun(
extension->id());
- extensions::AddExternalInstallError(this, extension, first_run);
+ external_install_manager_->AddExternalInstallError(extension, first_run);
}
- } else {
- extensions::RemoveExternalInstallError(this);
}
}

Powered by Google App Engine
This is Rietveld 408576698