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

Side by Side Diff: content/browser/renderer_host/media/media_stream_dispatcher_host.h

Issue 323313003: Add flag in device enumeration request to control label clearing and don't clear for pepper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_dispatcher_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 const GURL& security_origin, 72 const GURL& security_origin,
73 bool user_gesture); 73 bool user_gesture);
74 void OnCancelGenerateStream(int render_view_id, 74 void OnCancelGenerateStream(int render_view_id,
75 int page_request_id); 75 int page_request_id);
76 void OnStopStreamDevice(int render_view_id, 76 void OnStopStreamDevice(int render_view_id,
77 const std::string& device_id); 77 const std::string& device_id);
78 78
79 void OnEnumerateDevices(int render_view_id, 79 void OnEnumerateDevices(int render_view_id,
80 int page_request_id, 80 int page_request_id,
81 MediaStreamType type, 81 MediaStreamType type,
82 const GURL& security_origin); 82 const GURL& security_origin,
83 bool hide_labels_if_no_access);
83 84
84 void OnCancelEnumerateDevices(int render_view_id, 85 void OnCancelEnumerateDevices(int render_view_id,
85 int page_request_id); 86 int page_request_id);
86 87
87 void OnOpenDevice(int render_view_id, 88 void OnOpenDevice(int render_view_id,
88 int page_request_id, 89 int page_request_id,
89 const std::string& device_id, 90 const std::string& device_id,
90 MediaStreamType type, 91 MediaStreamType type,
91 const GURL& security_origin); 92 const GURL& security_origin);
92 93
93 void OnCloseDevice(int render_view_id, 94 void OnCloseDevice(int render_view_id,
94 const std::string& label); 95 const std::string& label);
95 96
96 void StoreRequest(int render_view_id, 97 void StoreRequest(int render_view_id,
97 int page_request_id, 98 int page_request_id,
98 const std::string& label);; 99 const std::string& label);
99 100
100 bool IsURLAllowed(const GURL& url); 101 bool IsURLAllowed(const GURL& url);
101 102
102 int render_process_id_; 103 int render_process_id_;
103 ResourceContext::SaltCallback salt_callback_; 104 ResourceContext::SaltCallback salt_callback_;
104 MediaStreamManager* media_stream_manager_; 105 MediaStreamManager* media_stream_manager_;
105 106
106 // Owned by ProfileIOData which is guaranteed to outlive MSDH. 107 // Owned by ProfileIOData which is guaranteed to outlive MSDH.
107 ResourceContext* const resource_context_; 108 ResourceContext* const resource_context_;
108 109
109 DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcherHost); 110 DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcherHost);
110 }; 111 };
111 112
112 } // namespace content 113 } // namespace content
113 114
114 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_ 115 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_dispatcher_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698