| Index: chrome/browser/extensions/api/preference/preference_helpers.cc
|
| diff --git a/chrome/browser/extensions/api/preference/preference_helpers.cc b/chrome/browser/extensions/api/preference/preference_helpers.cc
|
| index 8649f8eb04323ca5e72d0acef5ac2fedb314a2af..162e2ae862067f8127cb9d2e2ffe9b73d013f5ce 100644
|
| --- a/chrome/browser/extensions/api/preference/preference_helpers.cc
|
| +++ b/chrome/browser/extensions/api/preference/preference_helpers.cc
|
| @@ -12,6 +12,7 @@
|
| #include "chrome/browser/extensions/extension_prefs.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| +#include "chrome/browser/extensions/extension_util.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/extensions/incognito_handler.h"
|
|
|
| @@ -102,7 +103,7 @@ void DispatchEventToExtensions(
|
| if (router->ExtensionHasEventListener(extension_id, event_name) &&
|
| (*it)->HasAPIPermission(permission) &&
|
| (!incognito || IncognitoInfo::IsSplitMode(it->get()) ||
|
| - extension_service->CanCrossIncognito(it->get()))) {
|
| + extension_util::CanCrossIncognito(it->get(), extension_service))) {
|
| // Inject level of control key-value.
|
| base::DictionaryValue* dict;
|
| bool rv = args->GetDictionary(0, &dict);
|
| @@ -118,7 +119,9 @@ void DispatchEventToExtensions(
|
| Profile* restrict_to_profile = NULL;
|
| bool from_incognito = false;
|
| if (IncognitoInfo::IsSplitMode(it->get())) {
|
| - if (incognito && extension_service->IsIncognitoEnabled(extension_id)) {
|
| + if (incognito &&
|
| + extension_util::IsIncognitoEnabled(extension_id,
|
| + extension_service)) {
|
| restrict_to_profile = profile->GetOffTheRecordProfile();
|
| } else if (!incognito &&
|
| PreferenceAPI::Get(profile)->DoesExtensionControlPref(
|
|
|