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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 7497060: Support for guest signin and new user accounts in gaia signin screen. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 localized_strings->SetString("addUser", 86 localized_strings->SetString("addUser",
87 l10n_util::GetStringUTF16(IDS_ADD_USER_BUTTON)); 87 l10n_util::GetStringUTF16(IDS_ADD_USER_BUTTON));
88 localized_strings->SetString("cancel", 88 localized_strings->SetString("cancel",
89 l10n_util::GetStringUTF16(IDS_CANCEL)); 89 l10n_util::GetStringUTF16(IDS_CANCEL));
90 localized_strings->SetString("addUserOfflineMessage", 90 localized_strings->SetString("addUserOfflineMessage",
91 l10n_util::GetStringUTF16(IDS_LOGIN_ERROR_ADD_USER_OFFLINE)); 91 l10n_util::GetStringUTF16(IDS_LOGIN_ERROR_ADD_USER_OFFLINE));
92 localized_strings->SetString("offlineMessageTitle", 92 localized_strings->SetString("offlineMessageTitle",
93 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_TITLE)); 93 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_TITLE));
94 localized_strings->SetString("offlineMessageBody", 94 localized_strings->SetString("offlineMessageBody",
95 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_MESSAGE)); 95 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_MESSAGE));
96 localized_strings->SetString("createAccount",
97 l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_BUTTON));
98 localized_strings->SetString("guestSignin",
99 l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON));
96 100
97 if (extension_driven_) 101 if (extension_driven_)
98 localized_strings->SetString("authType", "ext"); 102 localized_strings->SetString("authType", "ext");
99 else 103 else
100 localized_strings->SetString("authType", "webui"); 104 localized_strings->SetString("authType", "webui");
101 } 105 }
102 106
103 void SigninScreenHandler::Show(bool oobe_ui) { 107 void SigninScreenHandler::Show(bool oobe_ui) {
104 oobe_ui_ = oobe_ui; 108 oobe_ui_ = oobe_ui;
105 if (!page_is_ready()) { 109 if (!page_is_ready()) {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 web_ui_->RegisterMessageCallback("showAddUser", 148 web_ui_->RegisterMessageCallback("showAddUser",
145 NewCallback(this, &SigninScreenHandler::HandleShowAddUser)); 149 NewCallback(this, &SigninScreenHandler::HandleShowAddUser));
146 web_ui_->RegisterMessageCallback("shutdownSystem", 150 web_ui_->RegisterMessageCallback("shutdownSystem",
147 NewCallback(this, &SigninScreenHandler::HandleShutdownSystem)); 151 NewCallback(this, &SigninScreenHandler::HandleShutdownSystem));
148 web_ui_->RegisterMessageCallback("removeUser", 152 web_ui_->RegisterMessageCallback("removeUser",
149 NewCallback(this, &SigninScreenHandler::HandleRemoveUser)); 153 NewCallback(this, &SigninScreenHandler::HandleRemoveUser));
150 web_ui_->RegisterMessageCallback("toggleEnrollmentScreen", 154 web_ui_->RegisterMessageCallback("toggleEnrollmentScreen",
151 NewCallback(this, &SigninScreenHandler::HandleToggleEnrollmentScreen)); 155 NewCallback(this, &SigninScreenHandler::HandleToggleEnrollmentScreen));
152 web_ui_->RegisterMessageCallback("launchHelpApp", 156 web_ui_->RegisterMessageCallback("launchHelpApp",
153 NewCallback(this, &SigninScreenHandler::HandleLaunchHelpApp)); 157 NewCallback(this, &SigninScreenHandler::HandleLaunchHelpApp));
158 web_ui_->RegisterMessageCallback("createAccount",
159 NewCallback(this, &SigninScreenHandler::HandleCreateAccount));
154 } 160 }
155 161
156 void SigninScreenHandler::HandleGetUsers(const base::ListValue* args) { 162 void SigninScreenHandler::HandleGetUsers(const base::ListValue* args) {
157 SendUserList(false); 163 SendUserList(false);
158 } 164 }
159 165
160 void SigninScreenHandler::ClearAndEnablePassword() { 166 void SigninScreenHandler::ClearAndEnablePassword() {
161 web_ui_->CallJavascriptFunction("cr.ui.Oobe.resetSigninUI"); 167 web_ui_->CallJavascriptFunction("cr.ui.Oobe.resetSigninUI");
162 } 168 }
163 169
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 void SigninScreenHandler::HandleShowAddUser(const base::ListValue* args) { 239 void SigninScreenHandler::HandleShowAddUser(const base::ListValue* args) {
234 if (extension_driven_) { 240 if (extension_driven_) {
235 DictionaryValue params; 241 DictionaryValue params;
236 params.SetString("startUrl", kGaiaExtStartPage); 242 params.SetString("startUrl", kGaiaExtStartPage);
237 243
238 std::string email; 244 std::string email;
239 // |args| can be null if it's OOBE. 245 // |args| can be null if it's OOBE.
240 if (args && args->GetString(0, &email)) 246 if (args && args->GetString(0, &email))
241 params.SetString("email", email); 247 params.SetString("email", email);
242 248
249 params.SetBoolean("createAccount",
250 UserCrosSettingsProvider::cached_allow_new_user());
251 params.SetBoolean("guestSignin",
252 UserCrosSettingsProvider::cached_allow_guest());
253
243 ShowScreen(kGaiaSigninScreen, &params); 254 ShowScreen(kGaiaSigninScreen, &params);
244 } else { 255 } else {
245 ShowScreen(kSigninScreen, NULL); 256 ShowScreen(kSigninScreen, NULL);
246 } 257 }
247 } 258 }
248 259
249 void SigninScreenHandler::HandleToggleEnrollmentScreen( 260 void SigninScreenHandler::HandleToggleEnrollmentScreen(
250 const base::ListValue* args) { 261 const base::ListValue* args) {
251 delegate_->ShowEnterpriseEnrollmentScreen(); 262 delegate_->ShowEnterpriseEnrollmentScreen();
252 } 263 }
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 guest_dict->SetString(kKeyImageUrl, image_url); 339 guest_dict->SetString(kKeyImageUrl, image_url);
329 users_list.Append(guest_dict); 340 users_list.Append(guest_dict);
330 } 341 }
331 342
332 // Call the Javascript callback 343 // Call the Javascript callback
333 base::FundamentalValue animated_value(animated); 344 base::FundamentalValue animated_value(animated);
334 web_ui_->CallJavascriptFunction("login.AccountPickerScreen.loadUsers", 345 web_ui_->CallJavascriptFunction("login.AccountPickerScreen.loadUsers",
335 users_list, animated_value); 346 users_list, animated_value);
336 } 347 }
337 348
349 void SigninScreenHandler::HandleCreateAccount(const base::ListValue* args) {
350 delegate_->CreateAccount();
351 }
352
338 } // namespace chromeos 353 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698