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

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 22938005: Add ErrorConsole UI for Extension Install Warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dc_ec_install_warnings
Patch Set: Yoyo's + temporarily remove *.png for apply issue Created 7 years, 4 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/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 fe97b1c2ab443b8b42adcc6ea7cd50c9419266a0..ab57d5f6f39f719962f8307449ec059875e41b23 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -26,6 +26,7 @@
#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
#include "chrome/browser/extensions/component_loader.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"
@@ -71,6 +72,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"
@@ -80,7 +82,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;
@@ -251,20 +254,16 @@ base::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<base::ListValue> list(new base::ListValue());
- for (std::vector<InstallWarning>::const_iterator it =
- install_warnings.begin(); it != install_warnings.end(); ++it) {
- base::DictionaryValue* item = new base::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;
@@ -294,8 +293,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",

Powered by Google App Engine
This is Rietveld 408576698