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

Side by Side Diff: chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h

Issue 483523005: Default to current UI locale when recommended locales are invalid (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit tests, for real this time. Created 6 years, 4 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 | « no previous file | chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CHROME_USER_SELECTION_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CHROME_USER_SELECTION_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CHROME_USER_SELECTION_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CHROME_USER_SELECTION_SCREEN_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 policy::DeviceLocalAccountPolicyBroker* broker); 45 policy::DeviceLocalAccountPolicyBroker* broker);
46 46
47 // Notify the UI that the display name for a public session has changed, 47 // Notify the UI that the display name for a public session has changed,
48 // taking the display name from the |User| owned by |UserManager|. 48 // taking the display name from the |User| owned by |UserManager|.
49 void SetPublicSessionDisplayName(const std::string& user_id); 49 void SetPublicSessionDisplayName(const std::string& user_id);
50 50
51 // Send an updated list of locales for a public session to the UI, consisting 51 // Send an updated list of locales for a public session to the UI, consisting
52 // of the |recommended_locales| followed by all other available locales. 52 // of the |recommended_locales| followed by all other available locales.
53 void SetPublicSessionLocales( 53 void SetPublicSessionLocales(
54 const std::string& user_id, 54 const std::string& user_id,
55 const std::vector<std::string>* recommended_locales); 55 const std::vector<std::string>& recommended_locales);
56 56
57 bool handler_initialized_; 57 bool handler_initialized_;
58 58
59 policy::DeviceLocalAccountPolicyService* device_local_account_policy_service_; 59 policy::DeviceLocalAccountPolicyService* device_local_account_policy_service_;
60 60
61 // Map from public session user IDs to their display names set by policy. 61 // Map from public session user IDs to their display names set by policy.
62 typedef std::map<std::string, std::string> DisplayNamesMap; 62 typedef std::map<std::string, std::string> DisplayNamesMap;
63 DisplayNamesMap public_session_display_names_; 63 DisplayNamesMap public_session_display_names_;
64 64
65 base::WeakPtrFactory<ChromeUserSelectionScreen> weak_factory_; 65 base::WeakPtrFactory<ChromeUserSelectionScreen> weak_factory_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(ChromeUserSelectionScreen); 67 DISALLOW_COPY_AND_ASSIGN(ChromeUserSelectionScreen);
68 }; 68 };
69 69
70 } // namespace chromeos 70 } // namespace chromeos
71 71
72 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CHROME_USER_SELECTION_SCREEN_H_ 72 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CHROME_USER_SELECTION_SCREEN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698