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

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

Issue 8176001: Warn user in case extension delays network traffic too much. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merged with ToT Created 9 years, 2 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
« no previous file with comments | « chrome/browser/ui/webui/options/extension_settings_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc
index 82234af3aab85a3ca59aedabe489956e21e79496..ccc5283fbe36149b8c579fced850f786ee14fd7c 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/extensions/extension_disabled_infobar_delegate.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_updater.h"
+#include "chrome/browser/extensions/extension_warning_set.h"
#include "chrome/browser/google/google_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/background_contents.h"
@@ -143,6 +144,8 @@ void ExtensionSettingsHandler::HandleRequestExtensionsData(
// Add the extensions to the results structure.
ListValue *extensions_list = new ListValue();
+ ExtensionWarningSet* warnings = extension_service_->extension_warnings();
+
const ExtensionList* extensions = extension_service_->extensions();
for (ExtensionList::const_iterator extension = extensions->begin();
extension != extensions->end(); ++extension) {
@@ -151,6 +154,7 @@ void ExtensionSettingsHandler::HandleRequestExtensionsData(
extension_service_,
*extension,
GetActivePagesForExtension(*extension),
+ warnings,
true, false)); // enabled, terminated
}
}
@@ -162,6 +166,7 @@ void ExtensionSettingsHandler::HandleRequestExtensionsData(
extension_service_,
*extension,
GetActivePagesForExtension(*extension),
+ warnings,
false, false)); // enabled, terminated
}
}
@@ -174,6 +179,7 @@ void ExtensionSettingsHandler::HandleRequestExtensionsData(
extension_service_,
*extension,
empty_pages, // Terminated process has no active pages.
+ warnings,
false, true)); // enabled, terminated
}
}
@@ -206,6 +212,8 @@ void ExtensionSettingsHandler::MaybeRegisterForNotifications() {
Source<Profile>(profile));
registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED,
Source<Profile>(profile));
+ registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_WARNING_CHANGED,
+ Source<Profile>(profile));
registrar_.Add(this,
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
NotificationService::AllBrowserContextsAndSources());
@@ -558,6 +566,8 @@ void ExtensionSettingsHandler::GetLocalizedValues(
l10n_util::GetStringUTF16(IDS_EXTENSIONS_CRASHED_EXTENSION));
localized_strings->SetString("extensionSettingsInDevelopment",
l10n_util::GetStringUTF16(IDS_EXTENSIONS_IN_DEVELOPMENT));
+ localized_strings->SetString("extensionSettingsWarningsTitle",
+ l10n_util::GetStringUTF16(IDS_EXTENSION_WARNINGS_TITLE));
}
void ExtensionSettingsHandler::Initialize() {
@@ -625,6 +635,7 @@ void ExtensionSettingsHandler::Observe(int type,
case chrome::NOTIFICATION_EXTENSION_PROCESS_CREATED:
case chrome::NOTIFICATION_EXTENSION_UNLOADED:
case chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED:
+ case chrome::NOTIFICATION_EXTENSION_WARNING_CHANGED:
case chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED:
MaybeUpdateAfterNotification();
break;
@@ -649,7 +660,9 @@ void ExtensionSettingsHandler::MaybeUpdateAfterNotification() {
// Static
DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
ExtensionService* service, const Extension* extension,
- const std::vector<ExtensionPage>& pages, bool enabled, bool terminated) {
+ const std::vector<ExtensionPage>& pages,
+ const ExtensionWarningSet* warnings_set,
+ bool enabled, bool terminated) {
DictionaryValue* extension_data = new DictionaryValue();
GURL icon =
ExtensionIconSource::GetIconURL(extension,
@@ -713,6 +726,22 @@ DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
extension->browser_action() || extension->page_action());
extension_data->SetString("homepageUrl", extension->GetHomepageURL().spec());
+ // Add warnings.
+ ListValue* warnings_list = new ListValue;
+ if (warnings_set) {
+ std::set<ExtensionWarningSet::WarningType> warnings;
+ warnings_set->GetWarningsAffectingExtension(extension->id(), &warnings);
+
+ for (std::set<ExtensionWarningSet::WarningType>::const_iterator iter =
+ warnings.begin();
+ iter != warnings.end();
+ ++iter) {
+ string16 warning_string(ExtensionWarningSet::GetLocalizedWarning(*iter));
+ warnings_list->Append(Value::CreateStringValue(warning_string));
+ }
+ }
+ extension_data->Set("warnings", warnings_list);
+
return extension_data;
}
« no previous file with comments | « chrome/browser/ui/webui/options/extension_settings_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698