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

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

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix UserScriptListenerTests.MultiProfile Created 6 years, 10 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/suspicious_extension_bubble_controller.cc
diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc
index c0906f9b46edac8779b0b9cb845a5a8f6a51c36e..6f40d0f4c9947fb911e9651bb71b29787d0a9b6e 100644
--- a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc
+++ b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc
@@ -10,6 +10,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_message_bubble.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/common/url_constants.h"
@@ -29,16 +30,15 @@ base::LazyInstance<std::set<Profile*> > g_shown_for_profiles =
// SuspiciousExtensionBubbleDelegate
SuspiciousExtensionBubbleDelegate::SuspiciousExtensionBubbleDelegate(
- ExtensionService* service)
- : service_(service) {
-}
+ Profile* profile)
+ : profile_(profile) {}
SuspiciousExtensionBubbleDelegate::~SuspiciousExtensionBubbleDelegate() {
}
bool SuspiciousExtensionBubbleDelegate::ShouldIncludeExtension(
const std::string& extension_id) {
- extensions::ExtensionPrefs* prefs = service_->extension_prefs();
+ extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_);
if (!prefs->IsExtensionDisabled(extension_id))
return false;
@@ -52,7 +52,7 @@ bool SuspiciousExtensionBubbleDelegate::ShouldIncludeExtension(
void SuspiciousExtensionBubbleDelegate::AcknowledgeExtension(
const std::string& extension_id,
ExtensionMessageBubbleController::BubbleAction user_action) {
- extensions::ExtensionPrefs* prefs = service_->extension_prefs();
+ extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_);
prefs->SetWipeoutAcknowledged(extension_id, true);
}
@@ -144,11 +144,9 @@ void SuspiciousExtensionBubbleController::ClearProfileListForTesting() {
SuspiciousExtensionBubbleController::SuspiciousExtensionBubbleController(
Profile* profile)
: ExtensionMessageBubbleController(
- new SuspiciousExtensionBubbleDelegate(
- extensions::ExtensionSystem::Get(profile)->extension_service()),
+ new SuspiciousExtensionBubbleDelegate(profile),
profile),
- profile_(profile) {
-}
+ profile_(profile) {}
SuspiciousExtensionBubbleController::~SuspiciousExtensionBubbleController() {
}
« no previous file with comments | « chrome/browser/extensions/suspicious_extension_bubble_controller.h ('k') | chrome/browser/extensions/unpacked_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698