| Index: chrome/common/pref_names.h
|
| diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
|
| index 8d6b9c2351c7ec0b47c84ba1256eda0a69b06bde..4ba1c7e8808406237baa495f664f90b73841cd5c 100644
|
| --- a/chrome/common/pref_names.h
|
| +++ b/chrome/common/pref_names.h
|
| @@ -399,10 +399,11 @@ extern const char kPreferenceResetTime[];
|
| extern const char kGCMChannelEnabled[];
|
| extern const char kPushMessagingRegistrationCount[];
|
|
|
| +extern const char kEasyUnlockAllowed[];
|
| extern const char kEasyUnlockEnabled[];
|
| -extern const char kEasyUnlockShowTutorial[];
|
| extern const char kEasyUnlockPairing[];
|
| -extern const char kEasyUnlockAllowed[];
|
| +extern const char kEasyUnlockProximityRequired[];
|
| +extern const char kEasyUnlockShowTutorial[];
|
|
|
| extern const char kZeroSuggestCachedResults[];
|
|
|
|
|