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

Side by Side Diff: chrome/common/pref_names.cc

Issue 54863002: Implement a salt for MediaSource IDs that can be cleared by a user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed review comments from tommi,joi and bauerb. Created 7 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 const char kGoogleGeolocationAccessEnabled[] = 1122 const char kGoogleGeolocationAccessEnabled[] =
1123 "googlegeolocationaccess.enabled"; 1123 "googlegeolocationaccess.enabled";
1124 #endif 1124 #endif
1125 1125
1126 // The default audio capture device used by the Media content setting. 1126 // The default audio capture device used by the Media content setting.
1127 const char kDefaultAudioCaptureDevice[] = "media.default_audio_capture_device"; 1127 const char kDefaultAudioCaptureDevice[] = "media.default_audio_capture_device";
1128 1128
1129 // The default video capture device used by the Media content setting. 1129 // The default video capture device used by the Media content setting.
1130 const char kDefaultVideoCaptureDevice[] = "media.default_video_capture_Device"; 1130 const char kDefaultVideoCaptureDevice[] = "media.default_video_capture_Device";
1131 1131
1132 // The salt used for creating random MediaSource IDs.
1133 const char kMediaDeviceIdSalt[] = "media.device_id_salt";
1134
1132 // Preference to disable 3D APIs (WebGL, Pepper 3D). 1135 // Preference to disable 3D APIs (WebGL, Pepper 3D).
1133 const char kDisable3DAPIs[] = "disable_3d_apis"; 1136 const char kDisable3DAPIs[] = "disable_3d_apis";
1134 1137
1135 // Whether to enable hyperlink auditing ("<a ping>"). 1138 // Whether to enable hyperlink auditing ("<a ping>").
1136 const char kEnableHyperlinkAuditing[] = "enable_a_ping"; 1139 const char kEnableHyperlinkAuditing[] = "enable_a_ping";
1137 1140
1138 // Whether to enable sending referrers. 1141 // Whether to enable sending referrers.
1139 const char kEnableReferrers[] = "enable_referrers"; 1142 const char kEnableReferrers[] = "enable_referrers";
1140 1143
1141 // Whether to send the DNT header. 1144 // Whether to send the DNT header.
(...skipping 1456 matching lines...) Expand 10 before | Expand all | Expand 10 after
2598 #if defined(OS_ANDROID) 2601 #if defined(OS_ANDROID)
2599 // A list of partner bookmark rename/remove mappings. 2602 // A list of partner bookmark rename/remove mappings.
2600 // Each list item is a dictionary containing a "url", a "provider_title" and 2603 // Each list item is a dictionary containing a "url", a "provider_title" and
2601 // "mapped_title" entries, detailing the bookmark target URL (if any), the title 2604 // "mapped_title" entries, detailing the bookmark target URL (if any), the title
2602 // given by the PartnerBookmarksProvider and either the user-visible renamed 2605 // given by the PartnerBookmarksProvider and either the user-visible renamed
2603 // title or an empty string if the bookmark node was removed. 2606 // title or an empty string if the bookmark node was removed.
2604 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; 2607 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
2605 #endif 2608 #endif
2606 2609
2607 } // namespace prefs 2610 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698