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

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

Issue 12310058: Show the managed user passphrase dialog when clicking unlock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 dfb409e6dcb93df05605625e2edaa3dcd0a22d19..aacb0e52ee14a0f45d67eeb072cccfd4eb04bc08 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -40,6 +40,7 @@
#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/ui/extensions/shell_window.h"
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
+#include "chrome/browser/ui/webui/managed_user_passphrase_dialog.h"
#include "chrome/browser/view_type_utils.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
@@ -544,13 +545,23 @@ void ExtensionSettingsHandler::ReloadUnpackedExtensions() {
}
}
+void ExtensionSettingsHandler::PassphraseDialogCallback(bool success) {
+ if (success)
+ HandleRequestExtensionsData(NULL);
+}
+
void ExtensionSettingsHandler::ManagedUserSetElevated(const ListValue* args) {
ManagedUserService* service = ManagedUserServiceFactory::GetForProfile(
Profile::FromWebUI(web_ui()));
bool elevated;
CHECK(args->GetBoolean(0, &elevated));
- // TODO(akuegel): Show the managed user passphrase dialog for authentication
- // if elevated should be set to true.
+ if (!service->IsElevated() && elevated) {
+ new ManagedUserPassphraseDialog(
+ web_ui()->GetWebContents(),
+ base::Bind(&ExtensionSettingsHandler::PassphraseDialogCallback,
+ base::Unretained(this)));
+ return;
+ }
service->SetElevated(elevated);
HandleRequestExtensionsData(NULL);
}
« 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