| Index: chrome/common/pref_names.cc
|
| diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
|
| index 97c7f1994530c9b6671ee6ce105c82c2c55e3d47..85a6d2122bf831c1ddf63d0da0a3445096a39ddb 100644
|
| --- a/chrome/common/pref_names.cc
|
| +++ b/chrome/common/pref_names.cc
|
| @@ -2475,6 +2475,9 @@ extern const char kLastAppListLaunchPing[] = "app_list.last_launch_ping";
|
| extern const char kAppListAppLaunchCount[] = "app_list.app_launch_count";
|
| extern const char kLastAppListAppLaunchPing[] = "app_list.last_app_launch_ping";
|
|
|
| +// How often the bubble has been shown.
|
| +extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown";
|
| +
|
| // A string pref for storing the salt used to compute the pepper device ID.
|
| const char kDRMSalt[] = "settings.privacy.drm_salt";
|
| // A boolean pref that enables the (private) pepper GetDeviceID() call.
|
|
|