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

Side by Side Diff: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

Issue 1191273002: ChromeOS: Show the new POD RE-AUTH ICON when users needs to re-auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/signin/user_manager_screen_handler.h" 5 #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/profiler/scoped_tracker.h" 10 #include "base/profiler/scoped_tracker.h"
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 web_ui()->RegisterMessageCallback("loginVisible", kDoNothingCallback); 681 web_ui()->RegisterMessageCallback("loginVisible", kDoNothingCallback);
682 // Unused callbacks from user_pod_row.js 682 // Unused callbacks from user_pod_row.js
683 web_ui()->RegisterMessageCallback("focusPod", kDoNothingCallback); 683 web_ui()->RegisterMessageCallback("focusPod", kDoNothingCallback);
684 } 684 }
685 685
686 void UserManagerScreenHandler::GetLocalizedValues( 686 void UserManagerScreenHandler::GetLocalizedValues(
687 base::DictionaryValue* localized_strings) { 687 base::DictionaryValue* localized_strings) {
688 // For Control Bar. 688 // For Control Bar.
689 localized_strings->SetString("signedIn", 689 localized_strings->SetString("signedIn",
690 l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_ACTIVE_USER)); 690 l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_ACTIVE_USER));
691 localized_strings->SetString("signinButton",
692 l10n_util::GetStringUTF16(IDS_LOGIN_BUTTON));
693 localized_strings->SetString("addUser", 691 localized_strings->SetString("addUser",
694 l10n_util::GetStringUTF16(IDS_ADD_USER_BUTTON)); 692 l10n_util::GetStringUTF16(IDS_ADD_USER_BUTTON));
695 localized_strings->SetString("cancel", l10n_util::GetStringUTF16(IDS_CANCEL)); 693 localized_strings->SetString("cancel", l10n_util::GetStringUTF16(IDS_CANCEL));
696 localized_strings->SetString("browseAsGuest", 694 localized_strings->SetString("browseAsGuest",
697 l10n_util::GetStringUTF16(IDS_GO_INCOGNITO_BUTTON)); 695 l10n_util::GetStringUTF16(IDS_GO_INCOGNITO_BUTTON));
698 localized_strings->SetString("signOutUser", 696 localized_strings->SetString("signOutUser",
699 l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_SIGN_OUT)); 697 l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_SIGN_OUT));
700 localized_strings->SetString("addSupervisedUser", 698 localized_strings->SetString("addSupervisedUser",
701 l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_MENU_LABEL)); 699 l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_MENU_LABEL));
702 700
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 Profile* profile, Profile::CreateStatus profile_create_status) { 916 Profile* profile, Profile::CreateStatus profile_create_status) {
919 Browser* browser = chrome::FindAnyBrowser(profile, false, desktop_type_); 917 Browser* browser = chrome::FindAnyBrowser(profile, false, desktop_type_);
920 if (browser && browser->window()) { 918 if (browser && browser->window()) {
921 OnBrowserWindowReady(browser); 919 OnBrowserWindowReady(browser);
922 } else { 920 } else {
923 registrar_.Add(this, 921 registrar_.Add(this,
924 chrome::NOTIFICATION_BROWSER_WINDOW_READY, 922 chrome::NOTIFICATION_BROWSER_WINDOW_READY,
925 content::NotificationService::AllSources()); 923 content::NotificationService::AllSources());
926 } 924 }
927 } 925 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | ui/login/account_picker/user_pod_row.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698