Index: chrome/browser/media/media_stream_infobar_delegate.cc |
diff --git a/chrome/browser/media/media_stream_infobar_delegate.cc b/chrome/browser/media/media_stream_infobar_delegate.cc |
index 7db4ea4bcca23f3af3848f7a6bf0ed282ce6a71f..c5940b8ee8e2ac0df5b0644856337b9ee7761771 100644 |
--- a/chrome/browser/media/media_stream_infobar_delegate.cc |
+++ b/chrome/browser/media/media_stream_infobar_delegate.cc |
@@ -74,12 +74,9 @@ MediaStreamInfoBarDelegate::MediaStreamInfoBarDelegate( |
DCHECK(controller_->HasAudio() || controller_->HasVideo()); |
} |
-void MediaStreamInfoBarDelegate::InfoBarDismissed() { |
- // Deny the request if the infobar was closed with the 'x' button, since |
- // we don't want WebRTC to be waiting for an answer that will never come. |
- UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions", |
- kCancel, kPermissionActionsMax); |
- controller_->Deny(false, content::MEDIA_DEVICE_PERMISSION_DISMISSED); |
+infobars::InfoBarDelegate::Type |
+MediaStreamInfoBarDelegate::GetInfoBarType() const { |
+ return PAGE_ACTION_TYPE; |
} |
int MediaStreamInfoBarDelegate::GetIconID() const { |
@@ -87,9 +84,12 @@ int MediaStreamInfoBarDelegate::GetIconID() const { |
IDR_INFOBAR_MEDIA_STREAM_CAMERA : IDR_INFOBAR_MEDIA_STREAM_MIC; |
} |
-infobars::InfoBarDelegate::Type MediaStreamInfoBarDelegate::GetInfoBarType() |
- const { |
- return PAGE_ACTION_TYPE; |
+void MediaStreamInfoBarDelegate::InfoBarDismissed() { |
+ // Deny the request if the infobar was closed with the 'x' button, since |
+ // we don't want WebRTC to be waiting for an answer that will never come. |
+ UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions", |
+ kCancel, kPermissionActionsMax); |
+ controller_->Deny(false, content::MEDIA_DEVICE_PERMISSION_DISMISSED); |
} |
MediaStreamInfoBarDelegate* |