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

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

Issue 1637913002: Change PermissionBubbleRequest::GetRequestingHostname to GetOrigin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
6 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 6 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 // 48 //
49 // This differs from PermissionGranted/PermissionDenied as they only operate 49 // This differs from PermissionGranted/PermissionDenied as they only operate
50 // on the permissions if they are in the ASK state. 50 // on the permissions if they are in the ASK state.
51 void ForcePermissionDeniedTemporarily(); 51 void ForcePermissionDeniedTemporarily();
52 52
53 // PermissionBubbleRequest: 53 // PermissionBubbleRequest:
54 int GetIconId() const override; 54 int GetIconId() const override;
55 base::string16 GetMessageText() const override; 55 base::string16 GetMessageText() const override;
56 base::string16 GetMessageTextFragment() const override; 56 base::string16 GetMessageTextFragment() const override;
57 bool HasUserGesture() const override; 57 bool HasUserGesture() const override;
58 GURL GetRequestingHostname() const override; 58 GURL GetOrigin() const override;
59 void PermissionGranted() override; 59 void PermissionGranted() override;
60 void PermissionDenied() override; 60 void PermissionDenied() override;
61 void Cancelled() override; 61 void Cancelled() override;
62 void RequestFinished() override; 62 void RequestFinished() override;
63 63
64 private: 64 private:
65 // Returns a list of devices available for the request for the given 65 // Returns a list of devices available for the request for the given
66 // audio/video permission settings. 66 // audio/video permission settings.
67 content::MediaStreamDevices GetDevices(ContentSetting audio_setting, 67 content::MediaStreamDevices GetDevices(ContentSetting audio_setting,
68 ContentSetting video_setting); 68 ContentSetting video_setting);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // audio/video devices was granted or not. 125 // audio/video devices was granted or not.
126 content::MediaResponseCallback callback_; 126 content::MediaResponseCallback callback_;
127 127
128 // Whether the permissions granted or denied by the user should be persisted. 128 // Whether the permissions granted or denied by the user should be persisted.
129 bool persist_permission_changes_; 129 bool persist_permission_changes_;
130 130
131 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController); 131 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController);
132 }; 132 };
133 133
134 #endif // CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 134 #endif // CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/download/download_permission_request.cc ('k') | chrome/browser/media/media_stream_devices_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698