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

Side by Side Diff: chrome/browser/media/webrtc/media_stream_devices_controller.h

Issue 2341953004: Decouple MediaStreamInfoBarDelegate from GroupedPermissionInfoBarDelegate (Closed)
Patch Set: address review comments Created 4 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/media/webrtc/media_stream_devices_controller.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 CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_
6 #define CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 6 #define CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 // Forces the permissions to be denied (without being persisted) regardless 50 // Forces the permissions to be denied (without being persisted) regardless
51 // of what the previous state was. If the user had previously allowed the 51 // of what the previous state was. If the user had previously allowed the
52 // site video or audio access, this ignores that and informs the site it was 52 // site video or audio access, this ignores that and informs the site it was
53 // denied. 53 // denied.
54 // 54 //
55 // This differs from PermissionGranted/PermissionDenied as they only operate 55 // This differs from PermissionGranted/PermissionDenied as they only operate
56 // on the permissions if they are in the ASK state. 56 // on the permissions if they are in the ASK state.
57 void ForcePermissionDeniedTemporarily(); 57 void ForcePermissionDeniedTemporarily();
58 58
59 // Answers a permission request with (possibly) different values for
60 // |audio_accepted| and |video_accepted|. Intended for use from
61 // MediaStreamInfobarDelegateAndroid.
62 // TODO(tsergeant): Remove this by refactoring Android to use
63 // PermissionRequest instead of a custom infobar delegate.
64 void GroupedRequestFinished(bool audio_accepted, bool video_accepted);
65
66 bool ShouldShowPersistenceToggle() const override; 59 bool ShouldShowPersistenceToggle() const override;
67 60
68 // PermissionRequest: 61 // PermissionRequest:
69 int GetIconId() const override; 62 int GetIconId() const override;
70 base::string16 GetMessageTextFragment() const override; 63 base::string16 GetMessageTextFragment() const override;
71 GURL GetOrigin() const override; 64 GURL GetOrigin() const override;
72 void PermissionGranted() override; 65 void PermissionGranted() override;
73 void PermissionDenied() override; 66 void PermissionDenied() override;
74 void Cancelled() override; 67 void Cancelled() override;
75 void RequestFinished() override; 68 void RequestFinished() override;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 const content::MediaStreamRequest request_; 129 const content::MediaStreamRequest request_;
137 130
138 // The callback that needs to be Run to notify WebRTC of whether access to 131 // The callback that needs to be Run to notify WebRTC of whether access to
139 // audio/video devices was granted or not. 132 // audio/video devices was granted or not.
140 content::MediaResponseCallback callback_; 133 content::MediaResponseCallback callback_;
141 134
142 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController); 135 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController);
143 }; 136 };
144 137
145 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 138 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/webrtc/media_stream_devices_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698