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

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

Issue 158833003: Represent kiosk apps as user pods instead of menu items. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: pngcrush Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 LocalizedValuesBuilder* builder) { 324 LocalizedValuesBuilder* builder) {
325 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT); 325 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT);
326 builder->Add("podMenuButtonAccessibleName", 326 builder->Add("podMenuButtonAccessibleName",
327 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME); 327 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME);
328 builder->Add("podMenuRemoveItemAccessibleName", 328 builder->Add("podMenuRemoveItemAccessibleName",
329 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); 329 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME);
330 builder->Add("passwordFieldAccessibleName", 330 builder->Add("passwordFieldAccessibleName",
331 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME); 331 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME);
332 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER); 332 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER);
333 builder->Add("signinButton", IDS_LOGIN_BUTTON); 333 builder->Add("signinButton", IDS_LOGIN_BUTTON);
334 builder->Add("launchAppButton", IDS_LAUNCH_APP_BUTTON);
334 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON); 335 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON);
335 builder->Add("addUser", IDS_ADD_USER_BUTTON); 336 builder->Add("addUser", IDS_ADD_USER_BUTTON);
336 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON); 337 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON);
337 builder->Add("cancel", IDS_CANCEL); 338 builder->Add("cancel", IDS_CANCEL);
338 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT); 339 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT);
339 builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML); 340 builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML);
340 builder->Add("ownerUserPattern", IDS_LOGIN_POD_OWNER_USER); 341 builder->Add("ownerUserPattern", IDS_LOGIN_POD_OWNER_USER);
341 builder->Add("removeUser", IDS_LOGIN_POD_REMOVE_USER); 342 builder->Add("removeUser", IDS_LOGIN_POD_REMOVE_USER);
342 builder->Add("errorTpmFailureTitle", IDS_LOGIN_ERROR_TPM_FAILURE_TITLE); 343 builder->Add("errorTpmFailureTitle", IDS_LOGIN_ERROR_TPM_FAILURE_TITLE);
343 builder->Add("errorTpmFailureReboot", IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT); 344 builder->Add("errorTpmFailureReboot", IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT);
(...skipping 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after
1727 DCHECK(gaia_screen_handler_); 1728 DCHECK(gaia_screen_handler_);
1728 return gaia_screen_handler_->frame_state(); 1729 return gaia_screen_handler_->frame_state();
1729 } 1730 }
1730 1731
1731 net::Error SigninScreenHandler::FrameError() const { 1732 net::Error SigninScreenHandler::FrameError() const {
1732 DCHECK(gaia_screen_handler_); 1733 DCHECK(gaia_screen_handler_);
1733 return gaia_screen_handler_->frame_error(); 1734 return gaia_screen_handler_->frame_error();
1734 } 1735 }
1735 1736
1736 } // namespace chromeos 1737 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698