chrome/browser/media/media_device_id_salt.h - Issue 2065383003: Revert of Make default media device ID salts random by default

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media/media_device_id_salt.h

Issue 2065383003: Revert of Make default media device ID salts random by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc ('k') | chrome/browser/media/media_device_id_salt.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_device_id_salt.h

diff --git a/chrome/browser/media/media_device_id_salt.h b/chrome/browser/media/media_device_id_salt.h

index 8db27317d876f871a2278506487d842ae37f02f9..5e1ec8fde31fe3150deceb44b95acb5d53480668 100644

--- a/chrome/browser/media/media_device_id_salt.h

+++ b/chrome/browser/media/media_device_id_salt.h

@@ -22,7 +22,7 @@

// callback returned by ResourceContext::GetMediaDeviceIDSalt.

class MediaDeviceIDSalt : public base::RefCountedThreadSafe<MediaDeviceIDSalt> {

public:

- explicit MediaDeviceIDSalt(PrefService* pref_service);

+ MediaDeviceIDSalt(PrefService* pref_service, bool incognito);

void ShutdownOnUIThread();

std::string GetSalt() const;

@@ -34,6 +34,9 @@

friend class base::RefCountedThreadSafe<MediaDeviceIDSalt>;

~MediaDeviceIDSalt();

+ // |incognito_salt_| is initialized in ctor on UI thread but only read

+ // on the IO thread.

+ std::string incognito_salt_;

mutable StringPrefMember media_device_id_salt_;

DISALLOW_COPY_AND_ASSIGN(MediaDeviceIDSalt);