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

Side by Side Diff: content/browser/resource_context_impl.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 webrtc_audio_private_browsertest comments. 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 "content/browser/resource_context_impl.h" 5 #include "content/browser/resource_context_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/fileapi/chrome_blob_storage_context.h" 8 #include "content/browser/fileapi/chrome_blob_storage_context.h"
9 #include "content/browser/host_zoom_map_impl.h" 9 #include "content/browser/host_zoom_map_impl.h"
10 #include "content/browser/loader/resource_dispatcher_host_impl.h" 10 #include "content/browser/loader/resource_dispatcher_host_impl.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 ResourceDispatcherHostImpl* rdhi = ResourceDispatcherHostImpl::Get(); 48 ResourceDispatcherHostImpl* rdhi = ResourceDispatcherHostImpl::Get();
49 if (rdhi) { 49 if (rdhi) {
50 rdhi->CancelRequestsForContext(this); 50 rdhi->CancelRequestsForContext(this);
51 rdhi->RemoveResourceContext(this); 51 rdhi->RemoveResourceContext(this);
52 } 52 }
53 53
54 // In some tests this object is destructed on UI thread. 54 // In some tests this object is destructed on UI thread.
55 DetachUserDataThread(); 55 DetachUserDataThread();
56 } 56 }
57 57
58 std::string ResourceContext::GetMediaDeviceIDSalt() {
59 return std::string();
60 }
61
58 scoped_ptr<net::ClientCertStore> ResourceContext::CreateClientCertStore() { 62 scoped_ptr<net::ClientCertStore> ResourceContext::CreateClientCertStore() {
59 return scoped_ptr<net::ClientCertStore>(); 63 return scoped_ptr<net::ClientCertStore>();
60 } 64 }
61 65
62 ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext( 66 ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext(
63 ResourceContext* resource_context) { 67 ResourceContext* resource_context) {
64 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
65 return UserDataAdapter<ChromeBlobStorageContext>::Get( 69 return UserDataAdapter<ChromeBlobStorageContext>::Get(
66 resource_context, kBlobStorageContextKeyName); 70 resource_context, kBlobStorageContextKeyName);
67 } 71 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 // store a non-owning pointer here. 112 // store a non-owning pointer here.
109 resource_context->SetUserData( 113 resource_context->SetUserData(
110 kHostZoomMapKeyName, 114 kHostZoomMapKeyName,
111 new NonOwningZoomData( 115 new NonOwningZoomData(
112 HostZoomMap::GetForBrowserContext(browser_context))); 116 HostZoomMap::GetForBrowserContext(browser_context)));
113 117
114 resource_context->DetachUserDataThread(); 118 resource_context->DetachUserDataThread();
115 } 119 }
116 120
117 } // namespace content 121 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698