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

Side by Side Diff: chrome/browser/ui/webui/options/managed_user_passphrase_handler.cc

Issue 14066003: Don't allow elevation for CHROME_OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bug in set_elevated function. Created 7 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/managed_user_passphrase_handler.h" 5 #include "chrome/browser/ui/webui/options/managed_user_passphrase_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 22 matching lines...) Expand all
33 void ManagedUserPassphraseHandler::RegisterMessages() { 33 void ManagedUserPassphraseHandler::RegisterMessages() {
34 web_ui()->RegisterMessageCallback( 34 web_ui()->RegisterMessageCallback(
35 "setPassphrase", 35 "setPassphrase",
36 base::Bind(&ManagedUserPassphraseHandler::SetLocalPassphrase, 36 base::Bind(&ManagedUserPassphraseHandler::SetLocalPassphrase,
37 weak_ptr_factory_.GetWeakPtr())); 37 weak_ptr_factory_.GetWeakPtr()));
38 web_ui()->RegisterMessageCallback( 38 web_ui()->RegisterMessageCallback(
39 "setElevated", 39 "setElevated",
40 base::Bind(&ManagedUserPassphraseHandler::SetElevated, 40 base::Bind(&ManagedUserPassphraseHandler::SetElevated,
41 weak_ptr_factory_.GetWeakPtr())); 41 weak_ptr_factory_.GetWeakPtr()));
42 web_ui()->RegisterMessageCallback( 42 web_ui()->RegisterMessageCallback(
43 "isPassphraseSet",
44 base::Bind(&ManagedUserPassphraseHandler::IsPassphraseSet,
45 weak_ptr_factory_.GetWeakPtr()));
46 web_ui()->RegisterMessageCallback(
47 "resetPassphrase", 43 "resetPassphrase",
48 base::Bind(&ManagedUserPassphraseHandler::ResetPassphrase, 44 base::Bind(&ManagedUserPassphraseHandler::ResetPassphrase,
49 weak_ptr_factory_.GetWeakPtr())); 45 weak_ptr_factory_.GetWeakPtr()));
50 } 46 }
51 47
52 void ManagedUserPassphraseHandler::GetLocalizedValues( 48 void ManagedUserPassphraseHandler::GetLocalizedValues(
53 base::DictionaryValue* localized_strings) { 49 base::DictionaryValue* localized_strings) {
54 DCHECK(localized_strings); 50 DCHECK(localized_strings);
55 51
56 static OptionsStringResource resources[] = { 52 static OptionsStringResource resources[] = {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 ManagedModeNavigationObserver::FromWebContents( 84 ManagedModeNavigationObserver::FromWebContents(
89 web_ui()->GetWebContents())->set_elevated(false); 85 web_ui()->GetWebContents())->set_elevated(false);
90 return; 86 return;
91 } 87 }
92 managed_user_service->RequestAuthorization( 88 managed_user_service->RequestAuthorization(
93 web_ui()->GetWebContents(), 89 web_ui()->GetWebContents(),
94 base::Bind(&ManagedUserPassphraseHandler::PassphraseDialogCallback, 90 base::Bind(&ManagedUserPassphraseHandler::PassphraseDialogCallback,
95 weak_ptr_factory_.GetWeakPtr())); 91 weak_ptr_factory_.GetWeakPtr()));
96 } 92 }
97 93
98 void ManagedUserPassphraseHandler::IsPassphraseSet(
99 const base::ListValue* args) {
100 // Get the name of the callback function.
101 std::string callback_function_name;
102 args->GetString(0, &callback_function_name);
103 PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
104 base::FundamentalValue is_passphrase_set(!pref_service->GetString(
105 prefs::kManagedModeLocalPassphrase).empty());
106 web_ui()->CallJavascriptFunction(callback_function_name,
107 is_passphrase_set);
108 }
109
110 void ManagedUserPassphraseHandler::ResetPassphrase( 94 void ManagedUserPassphraseHandler::ResetPassphrase(
111 const base::ListValue* args) { 95 const base::ListValue* args) {
112 PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs(); 96 PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
113 pref_service->SetString(prefs::kManagedModeLocalPassphrase, std::string()); 97 pref_service->SetString(prefs::kManagedModeLocalPassphrase, std::string());
114 pref_service->SetString(prefs::kManagedModeLocalSalt, std::string()); 98 pref_service->SetString(prefs::kManagedModeLocalSalt, std::string());
115 } 99 }
116 100
117 void ManagedUserPassphraseHandler::SetLocalPassphrase( 101 void ManagedUserPassphraseHandler::SetLocalPassphrase(
118 const base::ListValue* args) { 102 const base::ListValue* args) {
119 // Only change the passphrase if the custodian is authenticated. 103 // Only change the passphrase if the custodian is authenticated.
(...skipping 12 matching lines...) Expand all
132 PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs(); 116 PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
133 pref_service->SetString(prefs::kManagedModeLocalPassphrase, 117 pref_service->SetString(prefs::kManagedModeLocalPassphrase,
134 encoded_passphrase_hash); 118 encoded_passphrase_hash);
135 pref_service->SetString(prefs::kManagedModeLocalSalt, 119 pref_service->SetString(prefs::kManagedModeLocalSalt,
136 passphrase_key_generator.GetSalt()); 120 passphrase_key_generator.GetSalt());
137 } 121 }
138 // TODO(akuegel): Give failure back to the UI. 122 // TODO(akuegel): Give failure back to the UI.
139 } 123 }
140 124
141 } // namespace options 125 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/webui/options/managed_user_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698