| 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 1ea7fe847fec5cdca0b4903d5e953bf9874c89d7..e0f6f0db6c0940e2b6306bd688e33923d71bee49 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| @@ -25,6 +25,7 @@
|
| #include "chrome/browser/devtools/devtools_window.h"
|
| #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
|
| #include "chrome/browser/extensions/crx_installer.h"
|
| +#include "chrome/browser/extensions/error_console/error_console.h"
|
| #include "chrome/browser/extensions/extension_action_manager.h"
|
| #include "chrome/browser/extensions/extension_disabled_ui.h"
|
| #include "chrome/browser/extensions/extension_error_reporter.h"
|
| @@ -70,6 +71,7 @@
|
| #include "content/public/browser/web_contents_view.h"
|
| #include "content/public/browser/web_ui.h"
|
| #include "content/public/browser/web_ui_data_source.h"
|
| +#include "extensions/browser/extension_error.h"
|
| #include "extensions/browser/view_type_utils.h"
|
| #include "extensions/common/constants.h"
|
| #include "grit/browser_resources.h"
|
| @@ -79,7 +81,8 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| -
|
| +using base::DictionaryValue;
|
| +using base::ListValue;
|
| using content::RenderViewHost;
|
| using content::WebContents;
|
|
|
| @@ -250,20 +253,16 @@ DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
|
| }
|
| }
|
|
|
| - // Add install warnings (these are not the same as warnings!).
|
| - if (Manifest::IsUnpackedLocation(extension->location())) {
|
| - const std::vector<InstallWarning>& install_warnings =
|
| - extension->install_warnings();
|
| - if (!install_warnings.empty()) {
|
| - scoped_ptr<ListValue> list(new ListValue());
|
| - for (std::vector<InstallWarning>::const_iterator it =
|
| - install_warnings.begin(); it != install_warnings.end(); ++it) {
|
| - DictionaryValue* item = new DictionaryValue();
|
| - item->SetString("message", it->message);
|
| - list->Append(item);
|
| - }
|
| - extension_data->Set("installWarnings", list.release());
|
| + const ErrorConsole::ErrorList& errors =
|
| + ErrorConsole::Get(extension_service_->profile())->
|
| + GetErrorsForExtension(extension->id());
|
| + if (!errors.empty()) {
|
| + scoped_ptr<ListValue> list(new ListValue);
|
| + for (ErrorConsole::ErrorList::const_iterator iter = errors.begin();
|
| + iter != errors.end(); ++iter) {
|
| + list->Append((*iter)->ToValue().release());
|
| }
|
| + extension_data->Set("manifestErrors", list.release());
|
| }
|
|
|
| return extension_data;
|
| @@ -293,8 +292,6 @@ void ExtensionSettingsHandler::GetLocalizedValues(
|
| l10n_util::GetStringUTF16(IDS_EXTENSIONS_PATH));
|
| source->AddString("extensionSettingsInspectViews",
|
| l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSPECT_VIEWS));
|
| - source->AddString("extensionSettingsInstallWarnings",
|
| - l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALL_WARNINGS));
|
| source->AddString("viewIncognito",
|
| l10n_util::GetStringUTF16(IDS_EXTENSIONS_VIEW_INCOGNITO));
|
| source->AddString("viewInactive",
|
|
|