| Index: chrome/browser/media/chrome_midi_permission_context.cc
|
| diff --git a/chrome/browser/media/chrome_midi_permission_context.cc b/chrome/browser/media/chrome_midi_permission_context.cc
|
| index 73a788c885a73c1d9a320fc8395dcede5b06984c..57ea6439e9d2c0b388b7f2d3152fbf5b50e23672 100644
|
| --- a/chrome/browser/media/chrome_midi_permission_context.cc
|
| +++ b/chrome/browser/media/chrome_midi_permission_context.cc
|
| @@ -17,6 +17,7 @@
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "grit/generated_resources.h"
|
| +#include "grit/theme_resources.h"
|
| #include "net/base/net_util.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| @@ -31,10 +32,10 @@ class MidiPermissionRequest : public PermissionBubbleRequest {
|
| virtual ~MidiPermissionRequest();
|
|
|
| // PermissionBubbleDelegate:
|
| + virtual int GetIconID() const OVERRIDE;
|
| virtual base::string16 GetMessageText() const OVERRIDE;
|
| virtual base::string16 GetMessageTextFragment() const OVERRIDE;
|
| - virtual base::string16 GetAlternateAcceptButtonText() const OVERRIDE;
|
| - virtual base::string16 GetAlternateDenyButtonText() const OVERRIDE;
|
| + virtual bool HasUserGesture() const OVERRIDE;
|
| virtual void PermissionGranted() OVERRIDE;
|
| virtual void PermissionDenied() OVERRIDE;
|
| virtual void Cancelled() OVERRIDE;
|
| @@ -64,6 +65,10 @@ MidiPermissionRequest::MidiPermissionRequest(
|
|
|
| MidiPermissionRequest::~MidiPermissionRequest() {}
|
|
|
| +int MidiPermissionRequest::GetIconID() const {
|
| + return IDR_ALLOWED_MIDI_SYSEX;
|
| +}
|
| +
|
| base::string16 MidiPermissionRequest::GetMessageText() const {
|
| return l10n_util::GetStringFUTF16(
|
| IDS_MIDI_SYSEX_INFOBAR_QUESTION,
|
| @@ -74,12 +79,9 @@ base::string16 MidiPermissionRequest::GetMessageTextFragment() const {
|
| return l10n_util::GetStringUTF16(IDS_MIDI_SYSEX_PERMISSION_FRAGMENT);
|
| }
|
|
|
| -base::string16 MidiPermissionRequest::GetAlternateAcceptButtonText() const {
|
| - return l10n_util::GetStringUTF16(IDS_MIDI_SYSEX_ALLOW_BUTTON);
|
| -}
|
| -
|
| -base::string16 MidiPermissionRequest::GetAlternateDenyButtonText() const {
|
| - return l10n_util::GetStringUTF16(IDS_MIDI_SYSEX_DENY_BUTTON);
|
| +bool MidiPermissionRequest::HasUserGesture() const {
|
| + // TODO(gbillock): plumb through.
|
| + return false;
|
| }
|
|
|
| void MidiPermissionRequest::PermissionGranted() {
|
|
|