Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index e4347f8edd524a8b1ac01c4988b837de54b0225c..ead3408a6375b19f30cc50282d2c2a0db932fea3 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -47,6 +47,7 @@ |
#include "chrome/browser/guestview/guestview_constants.h" |
#include "chrome/browser/guestview/webview/webview_guest.h" |
#include "chrome/browser/media/media_capture_devices_dispatcher.h" |
+#include "chrome/browser/media/media_device_id_salt.h" |
#include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
#include "chrome/browser/nacl_host/nacl_browser.h" |
#include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
@@ -2380,6 +2381,14 @@ std::string ChromeContentBrowserClient::GetDefaultDownloadName() { |
return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME); |
} |
+std::string ChromeContentBrowserClient::GetDeviceIdSalt( |
Jói
2013/10/31 16:14:47
Should this name match the other, i.e. GetMediaDev
perkj_chrome
2013/10/31 17:05:44
Done.
|
+ content::ResourceContext* rc) { |
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
+ ProfileIOData* io_data = ProfileIOData::FromResourceContext(rc); |
+ |
+ return io_data->media_device_id_salt(); |
+} |
+ |
void ChromeContentBrowserClient::DidCreatePpapiPlugin( |
content::BrowserPpapiHost* browser_host) { |
#if defined(ENABLE_PLUGINS) |