| Index: extensions/browser/extension_warning_service.cc
|
| diff --git a/chrome/browser/extensions/extension_warning_service.cc b/extensions/browser/extension_warning_service.cc
|
| similarity index 75%
|
| rename from chrome/browser/extensions/extension_warning_service.cc
|
| rename to extensions/browser/extension_warning_service.cc
|
| index ab929a26a58b9cf8e1fce1aec3e66da992995643..d599eb9f96d8ef58e6180d9d2fe89e25bc0effff 100644
|
| --- a/chrome/browser/extensions/extension_warning_service.cc
|
| +++ b/extensions/browser/extension_warning_service.cc
|
| @@ -2,26 +2,25 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/extensions/extension_warning_service.h"
|
| +#include "extensions/browser/extension_warning_service.h"
|
|
|
| -#include "chrome/browser/browser_process.h"
|
| -#include "chrome/browser/extensions/extension_service.h"
|
| -#include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/profiles/profile_manager.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "extensions/browser/extension_registry.h"
|
| #include "extensions/browser/extension_system.h"
|
| +#include "extensions/browser/extensions_browser_client.h"
|
| +#include "extensions/common/extension_set.h"
|
|
|
| using content::BrowserThread;
|
|
|
| namespace extensions {
|
|
|
| -ExtensionWarningService::ExtensionWarningService(Profile* profile)
|
| - : profile_(profile), extension_registry_observer_(this) {
|
| +ExtensionWarningService::ExtensionWarningService(
|
| + content::BrowserContext* browser_context)
|
| + : browser_context_(browser_context), extension_registry_observer_(this) {
|
| DCHECK(CalledOnValidThread());
|
| - if (profile_) {
|
| - extension_registry_observer_.Add(
|
| - ExtensionRegistry::Get(profile_->GetOriginalProfile()));
|
| + if (browser_context_) {
|
| + extension_registry_observer_.Add(ExtensionRegistry::Get(
|
| + ExtensionsBrowserClient::Get()->GetOriginalContext(browser_context_)));
|
| }
|
| }
|
|
|
| @@ -64,13 +63,13 @@ ExtensionWarningService::GetWarningMessagesForExtension(
|
| DCHECK(CalledOnValidThread());
|
| std::vector<std::string> result;
|
|
|
| - const ExtensionService* extension_service =
|
| - ExtensionSystem::Get(profile_)->extension_service();
|
| + const ExtensionSet& extension_set =
|
| + ExtensionRegistry::Get(browser_context_)->enabled_extensions();
|
|
|
| for (ExtensionWarningSet::const_iterator i = warnings_.begin();
|
| i != warnings_.end(); ++i) {
|
| if (i->extension_id() == extension_id)
|
| - result.push_back(i->GetLocalizedMessage(extension_service->extensions()));
|
| + result.push_back(i->GetLocalizedMessage(&extension_set));
|
| }
|
| return result;
|
| }
|
| @@ -91,15 +90,17 @@ void ExtensionWarningService::NotifyWarningsOnUI(
|
| void* profile_id,
|
| const ExtensionWarningSet& warnings) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| - Profile* profile = reinterpret_cast<Profile*>(profile_id);
|
| - if (!profile ||
|
| - !g_browser_process->profile_manager() ||
|
| - !g_browser_process->profile_manager()->IsValidProfile(profile)) {
|
| + content::BrowserContext* browser_context =
|
| + reinterpret_cast<content::BrowserContext*>(profile_id);
|
| +
|
| + if (!browser_context ||
|
| + !ExtensionsBrowserClient::Get() ||
|
| + !ExtensionsBrowserClient::Get()->IsValidContext(browser_context)) {
|
| return;
|
| }
|
|
|
| extensions::ExtensionWarningService* warning_service =
|
| - extensions::ExtensionSystem::Get(profile)->warning_service();
|
| + extensions::ExtensionSystem::Get(browser_context)->warning_service();
|
|
|
| warning_service->AddWarnings(warnings);
|
| }
|
|
|