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

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

Issue 2385063005: Make PermissionRequest::GetIconId return different types (Closed)
Patch Set: android 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
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 bool ShouldShowPersistenceToggle() const override; 59 bool ShouldShowPersistenceToggle() const override;
60 60
61 // PermissionRequest: 61 // PermissionRequest:
62 int GetIconId() const override; 62 IconId GetIconId() const override;
63 base::string16 GetMessageTextFragment() const override; 63 base::string16 GetMessageTextFragment() const override;
64 GURL GetOrigin() const override; 64 GURL GetOrigin() const override;
65 void PermissionGranted() override; 65 void PermissionGranted() override;
66 void PermissionDenied() override; 66 void PermissionDenied() override;
67 void Cancelled() override; 67 void Cancelled() override;
68 void RequestFinished() override; 68 void RequestFinished() override;
69 PermissionRequestType GetPermissionRequestType() const override; 69 PermissionRequestType GetPermissionRequestType() const override;
70 70
71 private: 71 private:
72 // Returns a list of devices available for the request for the given 72 // Returns a list of devices available for the request for the given
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 const content::MediaStreamRequest request_; 129 const content::MediaStreamRequest request_;
130 130
131 // 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
132 // audio/video devices was granted or not. 132 // audio/video devices was granted or not.
133 content::MediaResponseCallback callback_; 133 content::MediaResponseCallback callback_;
134 134
135 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController); 135 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController);
136 }; 136 };
137 137
138 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 138 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698