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

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

Issue 17494004: Update Managed user strings for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years, 6 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/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 builder->Add("passwordChangedProceedAnyway", 427 builder->Add("passwordChangedProceedAnyway",
428 IDS_LOGIN_PASSWORD_CHANGED_PROCEED_ANYWAY); 428 IDS_LOGIN_PASSWORD_CHANGED_PROCEED_ANYWAY);
429 builder->Add("proceedAnywayButton", 429 builder->Add("proceedAnywayButton",
430 IDS_LOGIN_PASSWORD_CHANGED_PROCEED_ANYWAY_BUTTON); 430 IDS_LOGIN_PASSWORD_CHANGED_PROCEED_ANYWAY_BUTTON);
431 builder->Add("publicAccountInfoFormat", IDS_LOGIN_PUBLIC_ACCOUNT_INFO_FORMAT); 431 builder->Add("publicAccountInfoFormat", IDS_LOGIN_PUBLIC_ACCOUNT_INFO_FORMAT);
432 builder->Add("publicAccountReminder", 432 builder->Add("publicAccountReminder",
433 IDS_LOGIN_PUBLIC_ACCOUNT_SIGNOUT_REMINDER); 433 IDS_LOGIN_PUBLIC_ACCOUNT_SIGNOUT_REMINDER);
434 builder->Add("publicAccountEnter", IDS_LOGIN_PUBLIC_ACCOUNT_ENTER); 434 builder->Add("publicAccountEnter", IDS_LOGIN_PUBLIC_ACCOUNT_ENTER);
435 builder->Add("publicAccountEnterAccessibleName", 435 builder->Add("publicAccountEnterAccessibleName",
436 IDS_LOGIN_PUBLIC_ACCOUNT_ENTER_ACCESSIBLE_NAME); 436 IDS_LOGIN_PUBLIC_ACCOUNT_ENTER_ACCESSIBLE_NAME);
437 builder->Add("removeManagedUserWarningText", 437 builder->AddF("removeManagedUserWarningText",
438 IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING); 438 IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING,
439 UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL));
439 builder->Add("removeManagedUserWarningButtonTitle", 440 builder->Add("removeManagedUserWarningButtonTitle",
440 IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING_BUTTON); 441 IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING_BUTTON);
441 442
442 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) 443 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
443 builder->Add("demoLoginMessage", IDS_KIOSK_MODE_LOGIN_MESSAGE); 444 builder->Add("demoLoginMessage", IDS_KIOSK_MODE_LOGIN_MESSAGE);
444 } 445 }
445 446
446 void SigninScreenHandler::Show(bool oobe_ui) { 447 void SigninScreenHandler::Show(bool oobe_ui) {
447 CHECK(delegate_); 448 CHECK(delegate_);
448 oobe_ui_ = oobe_ui; 449 oobe_ui_ = oobe_ui;
(...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1644 if (!cros_settings) 1645 if (!cros_settings)
1645 return false; 1646 return false;
1646 1647
1647 // Offline login is allowed only when user pods are hidden. 1648 // Offline login is allowed only when user pods are hidden.
1648 bool show_pods; 1649 bool show_pods;
1649 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods); 1650 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods);
1650 return !show_pods; 1651 return !show_pods;
1651 } 1652 }
1652 1653
1653 } // namespace chromeos 1654 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698