| Index: chrome/browser/media/media_stream_infobar_delegate_android.h
|
| diff --git a/chrome/browser/media/media_stream_infobar_delegate_android.h b/chrome/browser/media/media_stream_infobar_delegate_android.h
|
| index ca821137d8dd8237ced360d8f12b5a3b34e23c79..ed811a96b6042224acdd38f507b89d95250c8a09 100644
|
| --- a/chrome/browser/media/media_stream_infobar_delegate_android.h
|
| +++ b/chrome/browser/media/media_stream_infobar_delegate_android.h
|
| @@ -10,14 +10,15 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "chrome/browser/media/media_stream_devices_controller.h"
|
| -#include "components/infobars/core/confirm_infobar_delegate.h"
|
| +#include "chrome/browser/permissions/grouped_permission_infobar_delegate.h"
|
|
|
| // This class configures an infobar shown when a page requests access to a
|
| // user's microphone and/or video camera. The user is shown a message asking
|
| // which audio and/or video devices he wishes to use with the current page, and
|
| // buttons to give access to the selected devices to the page, or to deny access
|
| // to them.
|
| -class MediaStreamInfoBarDelegateAndroid : public ConfirmInfoBarDelegate {
|
| +class MediaStreamInfoBarDelegateAndroid
|
| + : public GroupedPermissionInfoBarDelegate {
|
| public:
|
| ~MediaStreamInfoBarDelegateAndroid() override;
|
|
|
| @@ -28,9 +29,6 @@ class MediaStreamInfoBarDelegateAndroid : public ConfirmInfoBarDelegate {
|
| static bool Create(content::WebContents* web_contents,
|
| std::unique_ptr<MediaStreamDevicesController> controller);
|
|
|
| - bool IsRequestingVideoAccess() const;
|
| - bool IsRequestingMicrophoneAccess() const;
|
| -
|
| private:
|
| friend class WebRtcTestBase;
|
|
|
| @@ -39,17 +37,11 @@ class MediaStreamInfoBarDelegateAndroid : public ConfirmInfoBarDelegate {
|
|
|
| // ConfirmInfoBarDelegate:
|
| infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
|
| - Type GetInfoBarType() const override;
|
| - int GetIconId() const override;
|
| void InfoBarDismissed() override;
|
| MediaStreamInfoBarDelegateAndroid* AsMediaStreamInfoBarDelegateAndroid()
|
| override;
|
| - base::string16 GetMessageText() const override;
|
| - base::string16 GetButtonLabel(InfoBarButton button) const override;
|
| bool Accept() override;
|
| bool Cancel() override;
|
| - base::string16 GetLinkText() const override;
|
| - GURL GetLinkURL() const override;
|
|
|
| std::unique_ptr<MediaStreamDevicesController> controller_;
|
|
|
|
|