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

Unified Diff: chrome/browser/media/media_stream_devices_controller.cc

Issue 176053002: [WebsiteSettings] Change permission bubble API to adapt to new mocks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add multi-download bubble changes. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc
index 3b4e46149ddb10859cbaac0a30e028bbc49f775a..e4296ceeae7ba81247400164fbde8851da842dfa 100644
--- a/chrome/browser/media/media_stream_devices_controller.cc
+++ b/chrome/browser/media/media_stream_devices_controller.cc
@@ -349,6 +349,13 @@ void MediaStreamDevicesController::Deny(bool update_content_setting) {
cb.Run(content::MediaStreamDevices(), scoped_ptr<content::MediaStreamUI>());
}
+int MediaStreamDevicesController::GetIconID() const {
+ if (HasVideo())
+ return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
+
+ return IDR_INFOBAR_MEDIA_STREAM_MIC;
+}
+
base::string16 MediaStreamDevicesController::GetMessageText() const {
int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO;
if (!HasAudio())
@@ -368,14 +375,13 @@ base::string16 MediaStreamDevicesController::GetMessageTextFragment() const {
return l10n_util::GetStringUTF16(message_id);
}
-base::string16
-MediaStreamDevicesController::GetAlternateAcceptButtonText() const {
- return l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_ALLOW);
+bool MediaStreamDevicesController::HasUserGesture() const {
+ // TODO(gbillock): plumb this through
+ return false;
}
-base::string16
-MediaStreamDevicesController::GetAlternateDenyButtonText() const {
- return l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_DENY);
+GURL MediaStreamDevicesController::GetRequestingHostname() const {
+ return request_.security_origin;
}
void MediaStreamDevicesController::PermissionGranted() {

Powered by Google App Engine
This is Rietveld 408576698