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

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: review + fixes 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
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 LocalizedValuesBuilder* builder) { 317 LocalizedValuesBuilder* builder) {
318 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT); 318 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT);
319 builder->Add("podMenuButtonAccessibleName", 319 builder->Add("podMenuButtonAccessibleName",
320 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME); 320 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME);
321 builder->Add("podMenuRemoveItemAccessibleName", 321 builder->Add("podMenuRemoveItemAccessibleName",
322 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); 322 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME);
323 builder->Add("passwordFieldAccessibleName", 323 builder->Add("passwordFieldAccessibleName",
324 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME); 324 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME);
325 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER); 325 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER);
326 builder->Add("signinButton", IDS_LOGIN_BUTTON); 326 builder->Add("signinButton", IDS_LOGIN_BUTTON);
327 builder->Add("launchAppButton", IDS_LAUNCH_APP_BUTTON);
327 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON); 328 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON);
328 builder->Add("addUser", IDS_ADD_USER_BUTTON); 329 builder->Add("addUser", IDS_ADD_USER_BUTTON);
329 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON); 330 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON);
330 builder->Add("cancel", IDS_CANCEL); 331 builder->Add("cancel", IDS_CANCEL);
331 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT); 332 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT);
332 builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML); 333 builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML);
333 builder->Add("ownerUserPattern", IDS_LOGIN_POD_OWNER_USER); 334 builder->Add("ownerUserPattern", IDS_LOGIN_POD_OWNER_USER);
334 builder->Add("removeUser", IDS_LOGIN_POD_REMOVE_USER); 335 builder->Add("removeUser", IDS_LOGIN_POD_REMOVE_USER);
335 builder->Add("errorTpmFailureTitle", IDS_LOGIN_ERROR_TPM_FAILURE_TITLE); 336 builder->Add("errorTpmFailureTitle", IDS_LOGIN_ERROR_TPM_FAILURE_TITLE);
336 builder->Add("errorTpmFailureReboot", IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT); 337 builder->Add("errorTpmFailureReboot", IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT);
(...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after
1689 DCHECK(gaia_screen_handler_); 1690 DCHECK(gaia_screen_handler_);
1690 return gaia_screen_handler_->frame_state(); 1691 return gaia_screen_handler_->frame_state();
1691 } 1692 }
1692 1693
1693 net::Error SigninScreenHandler::FrameError() const { 1694 net::Error SigninScreenHandler::FrameError() const {
1694 DCHECK(gaia_screen_handler_); 1695 DCHECK(gaia_screen_handler_);
1695 return gaia_screen_handler_->frame_error(); 1696 return gaia_screen_handler_->frame_error();
1696 } 1697 }
1697 1698
1698 } // namespace chromeos 1699 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698