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

Side by Side Diff: chromeos/settings/cros_settings_names.cc

Issue 2691063002: arc: Use AndroidKioskAppInfoProto.display_name() as ARC++ Kiosk app name. (Closed)
Patch Set: fix post-merge nits from http://crrev.com/2451793002 Created 3 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
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 "chromeos/settings/cros_settings_names.h" 5 #include "chromeos/settings/cros_settings_names.h"
6 6
7 namespace chromeos { 7 namespace chromeos {
8 8
9 const char kCrosSettingsPrefix[] = "cros."; 9 const char kCrosSettingsPrefix[] = "cros.";
10 10
(...skipping 14 matching lines...) Expand all
25 const char kAccountsPrefDeviceLocalAccountsKeyKioskAppId[] = 25 const char kAccountsPrefDeviceLocalAccountsKeyKioskAppId[] =
26 "kiosk_app_id"; 26 "kiosk_app_id";
27 const char kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL[] = 27 const char kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL[] =
28 "kiosk_app_update_url"; 28 "kiosk_app_update_url";
29 const char kAccountsPrefDeviceLocalAccountsKeyArcKioskPackage[] = 29 const char kAccountsPrefDeviceLocalAccountsKeyArcKioskPackage[] =
30 "arc_kiosk_package"; 30 "arc_kiosk_package";
31 const char kAccountsPrefDeviceLocalAccountsKeyArcKioskClass[] = 31 const char kAccountsPrefDeviceLocalAccountsKeyArcKioskClass[] =
32 "arc_kiosk_class"; 32 "arc_kiosk_class";
33 const char kAccountsPrefDeviceLocalAccountsKeyArcKioskAction[] = 33 const char kAccountsPrefDeviceLocalAccountsKeyArcKioskAction[] =
34 "arc_kiosk_action"; 34 "arc_kiosk_action";
35 const char kAccountsPrefDeviceLocalAccountsKeyArcKioskDisplayName[] =
36 "arc_kiosk_display_name";
35 const char kAccountsPrefDeviceLocalAccountAutoLoginId[] = 37 const char kAccountsPrefDeviceLocalAccountAutoLoginId[] =
36 "cros.accounts.deviceLocalAccountAutoLoginId"; 38 "cros.accounts.deviceLocalAccountAutoLoginId";
37 const char kAccountsPrefDeviceLocalAccountAutoLoginDelay[] = 39 const char kAccountsPrefDeviceLocalAccountAutoLoginDelay[] =
38 "cros.accounts.deviceLocalAccountAutoLoginDelay"; 40 "cros.accounts.deviceLocalAccountAutoLoginDelay";
39 const char kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled[] = 41 const char kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled[] =
40 "cros.accounts.deviceLocalAccountAutoLoginBailoutEnabled"; 42 "cros.accounts.deviceLocalAccountAutoLoginBailoutEnabled";
41 const char kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline[] = 43 const char kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline[] =
42 "cros.accounts.deviceLocalAccountPromptForNetworkWhenOffline"; 44 "cros.accounts.deviceLocalAccountPromptForNetworkWhenOffline";
43 const char kAccountsPrefSupervisedUsersEnabled[] = 45 const char kAccountsPrefSupervisedUsersEnabled[] =
44 "cros.accounts.supervisedUsersEnabled"; 46 "cros.accounts.supervisedUsersEnabled";
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 // A list pref specifying the locales allowed on the login screen. Currently 236 // A list pref specifying the locales allowed on the login screen. Currently
235 // only the first value is used, as the single locale allowed on the login 237 // only the first value is used, as the single locale allowed on the login
236 // screen. 238 // screen.
237 const char kDeviceLoginScreenLocales[] = "cros.device_login_screen_locales"; 239 const char kDeviceLoginScreenLocales[] = "cros.device_login_screen_locales";
238 240
239 // A list pref containing the input method IDs allowed on the login screen. 241 // A list pref containing the input method IDs allowed on the login screen.
240 const char kDeviceLoginScreenInputMethods[] = 242 const char kDeviceLoginScreenInputMethods[] =
241 "cros.device_login_screen_input_methods"; 243 "cros.device_login_screen_input_methods";
242 244
243 } // namespace chromeos 245 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698