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

Side by Side Diff: chrome/browser/media/desktop_streams_registry.cc

Issue 1099803003: [chrome/browser/media] favor DCHECK_CURRENTLY_ON for better logs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build issue Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/media/desktop_streams_registry.h" 5 #include "chrome/browser/media/desktop_streams_registry.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
(...skipping 18 matching lines...) Expand all
29 29
30 DesktopStreamsRegistry::DesktopStreamsRegistry() {} 30 DesktopStreamsRegistry::DesktopStreamsRegistry() {}
31 DesktopStreamsRegistry::~DesktopStreamsRegistry() {} 31 DesktopStreamsRegistry::~DesktopStreamsRegistry() {}
32 32
33 std::string DesktopStreamsRegistry::RegisterStream( 33 std::string DesktopStreamsRegistry::RegisterStream(
34 int render_process_id, 34 int render_process_id,
35 int render_frame_id, 35 int render_frame_id,
36 const GURL& origin, 36 const GURL& origin,
37 const content::DesktopMediaID& source, 37 const content::DesktopMediaID& source,
38 const std::string& extension_name) { 38 const std::string& extension_name) {
39 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 39 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
40 40
41 std::string id = GenerateRandomStreamId(); 41 std::string id = GenerateRandomStreamId();
42 DCHECK(approved_streams_.find(id) == approved_streams_.end()); 42 DCHECK(approved_streams_.find(id) == approved_streams_.end());
43 ApprovedDesktopMediaStream& stream = approved_streams_[id]; 43 ApprovedDesktopMediaStream& stream = approved_streams_[id];
44 stream.render_process_id = render_process_id; 44 stream.render_process_id = render_process_id;
45 stream.render_frame_id = render_frame_id; 45 stream.render_frame_id = render_frame_id;
46 stream.origin = origin; 46 stream.origin = origin;
47 stream.source = source; 47 stream.source = source;
48 stream.extension_name = extension_name; 48 stream.extension_name = extension_name;
49 49
50 content::BrowserThread::PostDelayedTask( 50 content::BrowserThread::PostDelayedTask(
51 content::BrowserThread::UI, FROM_HERE, 51 content::BrowserThread::UI, FROM_HERE,
52 base::Bind(&DesktopStreamsRegistry::CleanupStream, 52 base::Bind(&DesktopStreamsRegistry::CleanupStream,
53 base::Unretained(this), id), 53 base::Unretained(this), id),
54 base::TimeDelta::FromSeconds(kApprovedStreamTimeToLiveSeconds)); 54 base::TimeDelta::FromSeconds(kApprovedStreamTimeToLiveSeconds));
55 55
56 return id; 56 return id;
57 } 57 }
58 58
59 content::DesktopMediaID DesktopStreamsRegistry::RequestMediaForStreamId( 59 content::DesktopMediaID DesktopStreamsRegistry::RequestMediaForStreamId(
60 const std::string& id, 60 const std::string& id,
61 int render_process_id, 61 int render_process_id,
62 int render_frame_id, 62 int render_frame_id,
63 const GURL& origin, 63 const GURL& origin,
64 std::string* extension_name) { 64 std::string* extension_name) {
65 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 65 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
66 66
67 StreamsMap::iterator it = approved_streams_.find(id); 67 StreamsMap::iterator it = approved_streams_.find(id);
68 68
69 // Verify that if there is a request with the specified ID it was created for 69 // Verify that if there is a request with the specified ID it was created for
70 // the same origin and the same renderer. 70 // the same origin and the same renderer.
71 if (it == approved_streams_.end() || 71 if (it == approved_streams_.end() ||
72 render_process_id != it->second.render_process_id || 72 render_process_id != it->second.render_process_id ||
73 render_frame_id != it->second.render_frame_id || 73 render_frame_id != it->second.render_frame_id ||
74 origin != it->second.origin) { 74 origin != it->second.origin) {
75 return content::DesktopMediaID(); 75 return content::DesktopMediaID();
76 } 76 }
77 77
78 content::DesktopMediaID result = it->second.source; 78 content::DesktopMediaID result = it->second.source;
79 *extension_name = it->second.extension_name; 79 *extension_name = it->second.extension_name;
80 approved_streams_.erase(it); 80 approved_streams_.erase(it);
81 return result; 81 return result;
82 } 82 }
83 83
84 void DesktopStreamsRegistry::CleanupStream(const std::string& id) { 84 void DesktopStreamsRegistry::CleanupStream(const std::string& id) {
85 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 85 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
86 approved_streams_.erase(id); 86 approved_streams_.erase(id);
87 } 87 }
88 88
89 DesktopStreamsRegistry::ApprovedDesktopMediaStream::ApprovedDesktopMediaStream() 89 DesktopStreamsRegistry::ApprovedDesktopMediaStream::ApprovedDesktopMediaStream()
90 : render_process_id(-1), render_frame_id(-1) {} 90 : render_process_id(-1), render_frame_id(-1) {}
OLDNEW
« no previous file with comments | « chrome/browser/media/desktop_media_list_ash.cc ('k') | chrome/browser/media/media_capture_devices_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698