Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/flag_descriptions.h" | 5 #include "chrome/browser/flag_descriptions.h" |
| 6 | 6 |
| 7 namespace flag_descriptions { | 7 namespace flag_descriptions { |
| 8 | 8 |
| 9 // Material Design version of chrome://bookmarks | 9 // Material Design version of chrome://bookmarks |
| 10 | 10 |
| (...skipping 2885 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2896 | 2896 |
| 2897 const char kAggressiveThresholds[] = | 2897 const char kAggressiveThresholds[] = |
| 2898 "Aggressive tab and cache release strategy"; | 2898 "Aggressive tab and cache release strategy"; |
| 2899 | 2899 |
| 2900 const char kWakeOnPacketsName[] = "Wake On Packets"; | 2900 const char kWakeOnPacketsName[] = "Wake On Packets"; |
| 2901 | 2901 |
| 2902 const char kWakeOnPacketsDescription[] = | 2902 const char kWakeOnPacketsDescription[] = |
| 2903 "Enables waking the device based on the receipt of some network " | 2903 "Enables waking the device based on the receipt of some network " |
| 2904 "packets."; | 2904 "packets."; |
| 2905 | 2905 |
| 2906 const char kQuickUnlockPinName[] = "Quick Unlock (PIN)"; | 2906 const char kNetworkSettingsConfigName[] = |
|
michaelpg
2017/05/18 21:14:22
why aren't these in the same order as the .h? (too
stevenjb
2017/05/19 23:35:34
I think the headers were sorted while this was in
| |
| 2907 "Settings based Network Configuration"; | |
| 2908 | |
| 2909 const char kNetworkSettingsConfigDescription[] = | |
| 2910 "Enables the Settings based network configraiton UI instead of the Views " | |
|
michaelpg
2017/05/18 21:14:22
"configuration"
stevenjb
2017/05/19 23:35:33
Done.
| |
| 2911 "based configuration dialog."; | |
| 2912 | |
| 2913 const char kQuickUnlockPin[] = "Quick Unlock (PIN)"; | |
|
michaelpg
2017/05/18 21:14:22
dropping "Name" intentional? (again too lazy to ch
stevenjb
2017/05/19 23:35:34
Merge bug.
| |
| 2907 | 2914 |
| 2908 const char kQuickUnlockPinDescription[] = | 2915 const char kQuickUnlockPinDescription[] = |
| 2909 "Enabling PIN quick unlock allows you to use a PIN to unlock your ChromeOS " | 2916 "Enabling PIN quick unlock allows you to use a PIN to unlock your ChromeOS " |
| 2910 "device on the lock screen after you have signed into your device."; | 2917 "device on the lock screen after you have signed into your device."; |
| 2911 | 2918 |
| 2912 const char kQuickUnlockPinSignin[] = "Enable PIN when logging in."; | 2919 const char kQuickUnlockPinSignin[] = "Enable PIN when logging in."; |
| 2913 | 2920 |
| 2914 const char kQuickUnlockPinSigninDescription[] = | 2921 const char kQuickUnlockPinSigninDescription[] = |
| 2915 "Enabling PIN allows you to use a PIN to sign in and unlock your ChromeOS " | 2922 "Enabling PIN allows you to use a PIN to sign in and unlock your ChromeOS " |
| 2916 "device. After changing this flag PIN needs to be set up again."; | 2923 "device. After changing this flag PIN needs to be set up again."; |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3144 | 3151 |
| 3145 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 3152 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
| 3146 | 3153 |
| 3147 #if defined(OS_MACOSX) | 3154 #if defined(OS_MACOSX) |
| 3148 extern const char kMacRTLName[] = "Enable RTL"; | 3155 extern const char kMacRTLName[] = "Enable RTL"; |
| 3149 extern const char kMacRTLDescription[] = | 3156 extern const char kMacRTLDescription[] = |
| 3150 "Mirrors the UI for RTL language users"; | 3157 "Mirrors the UI for RTL language users"; |
| 3151 #endif | 3158 #endif |
| 3152 | 3159 |
| 3153 } // namespace flag_descriptions | 3160 } // namespace flag_descriptions |
| OLD | NEW |