| Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| index 7678bd6bd9f13e1916ad58b013ea8b23572b8a9e..28beca99918e3c7b8c41173aee8d3166fbc51a7b 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| @@ -37,7 +37,6 @@
|
| #include "chrome/browser/extensions/extension_tab_util.h"
|
| #include "chrome/browser/extensions/extension_ui_util.h"
|
| #include "chrome/browser/extensions/extension_util.h"
|
| -#include "chrome/browser/extensions/extension_warning_set.h"
|
| #include "chrome/browser/extensions/install_verifier.h"
|
| #include "chrome/browser/extensions/path_util.h"
|
| #include "chrome/browser/extensions/shared_module_service.h"
|
| @@ -82,6 +81,7 @@
|
| #include "extensions/browser/pref_names.h"
|
| #include "extensions/browser/uninstall_reason.h"
|
| #include "extensions/browser/view_type_utils.h"
|
| +#include "extensions/browser/warning_set.h"
|
| #include "extensions/common/constants.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/extension_icon_set.h"
|
| @@ -210,7 +210,7 @@ void ExtensionSettingsHandler::RegisterProfilePrefs(
|
| base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
|
| const Extension* extension,
|
| const std::vector<ExtensionPage>& pages,
|
| - const ExtensionWarningService* warning_service) {
|
| + const WarningService* warning_service) {
|
| base::DictionaryValue* extension_data = new base::DictionaryValue();
|
| bool enabled = extension_service_->IsExtensionEnabled(extension->id());
|
| GetExtensionBasicInfo(extension, enabled, extension_data);
|
| @@ -822,8 +822,7 @@ void ExtensionSettingsHandler::HandleRequestExtensionsData(
|
| // Add the extensions to the results structure.
|
| base::ListValue* extensions_list = new base::ListValue();
|
|
|
| - ExtensionWarningService* warnings =
|
| - ExtensionSystem::Get(profile)->warning_service();
|
| + WarningService* warnings = ExtensionSystem::Get(profile)->warning_service();
|
|
|
| ExtensionRegistry* registry = ExtensionRegistry::Get(profile);
|
| const ExtensionSet& enabled_set = registry->enabled_extensions();
|
|
|