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

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

Issue 1013613002: Three dot menu is shown now on WebView start screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Button used instead of div for 'Add SU user'. Created 5 years, 9 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/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); 352 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME);
353 builder->Add("passwordFieldAccessibleName", 353 builder->Add("passwordFieldAccessibleName",
354 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME); 354 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME);
355 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER); 355 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER);
356 builder->Add("signinButton", IDS_LOGIN_BUTTON); 356 builder->Add("signinButton", IDS_LOGIN_BUTTON);
357 builder->Add("launchAppButton", IDS_LAUNCH_APP_BUTTON); 357 builder->Add("launchAppButton", IDS_LAUNCH_APP_BUTTON);
358 builder->Add("restart", IDS_RESTART_BUTTON); 358 builder->Add("restart", IDS_RESTART_BUTTON);
359 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON); 359 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON);
360 builder->Add("addUser", IDS_ADD_USER_BUTTON); 360 builder->Add("addUser", IDS_ADD_USER_BUTTON);
361 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON); 361 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON);
362 builder->Add("addSupervisedUser", IDS_CREATE_SUPERVISED_USER_MENU_LABEL);
362 builder->Add("cancel", IDS_CANCEL); 363 builder->Add("cancel", IDS_CANCEL);
363 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT); 364 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT);
364 builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML); 365 builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML);
365 builder->Add("ownerUserPattern", IDS_LOGIN_POD_OWNER_USER); 366 builder->Add("ownerUserPattern", IDS_LOGIN_POD_OWNER_USER);
366 builder->Add("removeUser", IDS_LOGIN_POD_REMOVE_USER); 367 builder->Add("removeUser", IDS_LOGIN_POD_REMOVE_USER);
367 builder->Add("errorTpmFailureTitle", IDS_LOGIN_ERROR_TPM_FAILURE_TITLE); 368 builder->Add("errorTpmFailureTitle", IDS_LOGIN_ERROR_TPM_FAILURE_TITLE);
368 builder->Add("errorTpmFailureReboot", IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT); 369 builder->Add("errorTpmFailureReboot", IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT);
369 builder->Add("errorTpmFailureRebootButton", 370 builder->Add("errorTpmFailureRebootButton",
370 IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT_BUTTON); 371 IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT_BUTTON);
371 372
(...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 return gaia_screen_handler_->frame_error(); 1370 return gaia_screen_handler_->frame_error();
1370 } 1371 }
1371 1372
1372 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1373 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1373 caps_lock_enabled_ = enabled; 1374 caps_lock_enabled_ = enabled;
1374 if (page_is_ready()) 1375 if (page_is_ready())
1375 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1376 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1376 } 1377 }
1377 1378
1378 } // namespace chromeos 1379 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698