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

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

Issue 12212195: Re-land "view permission" feature (r179916) with Mac Fix. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac Fix Integrated Created 7 years, 10 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/extensions/extension_settings_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 559d261e8336a672319f6e0914083cef29b99576..21c798dd96b3351624beacf9d912de211114cea3 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -307,6 +307,8 @@ void ExtensionSettingsHandler::GetLocalizedValues(
l10n_util::GetStringUTF16(IDS_EXTENSIONS_RELOAD_UNPACKED));
source->AddString("extensionSettingsOptions",
l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS_LINK));
+ source->AddString("extensionSettingsPermissions",
+ l10n_util::GetStringUTF16(IDS_EXTENSIONS_PERMISSIONS_LINK));
source->AddString("extensionSettingsActivity",
l10n_util::GetStringUTF16(IDS_EXTENSIONS_ACTIVITY_LINK));
source->AddString("extensionSettingsVisitWebsite",
@@ -401,6 +403,9 @@ void ExtensionSettingsHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback("extensionSettingsOptions",
base::Bind(&ExtensionSettingsHandler::HandleOptionsMessage,
base::Unretained(this)));
+ web_ui()->RegisterMessageCallback("extensionSettingsPermissions",
+ base::Bind(&ExtensionSettingsHandler::HandlePermissionsMessage,
+ base::Unretained(this)));
web_ui()->RegisterMessageCallback("extensionSettingsShowButton",
base::Bind(&ExtensionSettingsHandler::HandleShowButtonMessage,
base::Unretained(this)));
@@ -509,6 +514,14 @@ void ExtensionSettingsHandler::ExtensionWarningsChanged() {
MaybeUpdateAfterNotification();
}
+void ExtensionSettingsHandler::InstallUIProceed() {
+ // This should never happen. The dialog only has a cancel button.
+ NOTREACHED();
+}
+
+void ExtensionSettingsHandler::InstallUIAbort(bool user_initiated) {
+}
+
void ExtensionSettingsHandler::ReloadUnpackedExtensions() {
const ExtensionSet* extensions = extension_service_->extensions();
std::vector<const Extension*> unpacked_extensions;
@@ -798,6 +811,18 @@ void ExtensionSettingsHandler::HandleOptionsMessage(const ListValue* args) {
chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()));
}
+void ExtensionSettingsHandler::HandlePermissionsMessage(const ListValue* args) {
+ std::string extension_id(UTF16ToUTF8(ExtractStringValue(args)));
+ CHECK(!extension_id.empty());
+ const Extension* extension =
+ extension_service_->GetExtensionById(extension_id, true);
+ if (!extension)
+ return;
+
+ prompt_.reset(new ExtensionInstallPrompt(web_contents()));
+ prompt_->ReviewPermissions(this, extension);
+}
+
void ExtensionSettingsHandler::HandleShowButtonMessage(const ListValue* args) {
const Extension* extension = GetActiveExtension(args);
if (!extension)
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698