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

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

Issue 156173002: [MIDI] Add a permission bubble client for MIDI system control. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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/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 e67be3332813bbe47eaef66d52281d544ea71ca7..d6b440d2f1154ccb2f055255bdf3bf1049e69e89 100644
--- a/chrome/browser/media/chrome_midi_permission_context.cc
+++ b/chrome/browser/media/chrome_midi_permission_context.cc
@@ -11,8 +11,93 @@
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
+#include "chrome/browser/ui/website_settings/permission_bubble_request.h"
+#include "chrome/common/pref_names.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
+#include "grit/generated_resources.h"
+#include "net/base/net_util.h"
+#include "ui/base/l10n/l10n_util.h"
+
+class MidiPermissionRequest : public PermissionBubbleRequest {
+ public:
+ MidiPermissionRequest(
+ ChromeMidiPermissionContext* context,
+ const PermissionRequestID& id,
+ const GURL& requesting_frame,
+ const std::string& display_languages,
+ const content::BrowserContext::MidiSysExPermissionCallback& callback);
+ virtual ~MidiPermissionRequest();
+
+ // PermissionBubbleDelegate:
+ 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 void PermissionGranted() OVERRIDE;
+ virtual void PermissionDenied() OVERRIDE;
+ virtual void Cancelled() OVERRIDE;
+ virtual void RequestFinished() OVERRIDE;
+
+ private:
+ ChromeMidiPermissionContext* context_;
Ami GONE FROM CHROMIUM 2014/02/06 19:51:17 This is a raw pointer; what guarantees it remains
Greg Billock 2014/02/07 18:20:55 The permission context is a profile keyed service,
+ const PermissionRequestID id_;
+ GURL requesting_frame_;
+ int contents_unique_id_;
Ami GONE FROM CHROMIUM 2014/02/06 19:51:17 unused (why didn't your compiler tell you this?)
Greg Billock 2014/02/07 18:20:55 not sure. Removing.
+ std::string display_languages_;
+ const content::BrowserContext::MidiSysExPermissionCallback& callback_;
+
+ DISALLOW_COPY_AND_ASSIGN(MidiPermissionRequest);
+};
+
+MidiPermissionRequest::MidiPermissionRequest(
+ ChromeMidiPermissionContext* context,
+ const PermissionRequestID& id,
+ const GURL& requesting_frame,
+ const std::string& display_languages,
+ const content::BrowserContext::MidiSysExPermissionCallback& callback)
+ : context_(context),
+ id_(id),
+ requesting_frame_(requesting_frame),
+ display_languages_(display_languages),
+ callback_(callback) {}
+
+MidiPermissionRequest::~MidiPermissionRequest() {}
+
+base::string16 MidiPermissionRequest::GetMessageText() const {
+ return l10n_util::GetStringFUTF16(
+ IDS_MIDI_SYSEX_INFOBAR_QUESTION,
+ net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_));
+}
+
+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);
Ami GONE FROM CHROMIUM 2014/02/06 19:51:17 This seems pretty stock. I wonder if PermissionBu
Greg Billock 2014/02/07 18:20:55 That's an option. The interface is pure right now,
Ami GONE FROM CHROMIUM 2014/02/07 18:25:34 Yeah, nice for job security for the guy who re-imp
Greg Billock 2014/02/10 23:57:10 :-) We have eight of them. I guess that's perhaps
+}
+
+void MidiPermissionRequest::PermissionGranted() {
+ context_->NotifyPermissionSet(id_, requesting_frame_, callback_, true);
+}
+
+void MidiPermissionRequest::PermissionDenied() {
+ context_->NotifyPermissionSet(id_, requesting_frame_, callback_, false);
+}
+
+void MidiPermissionRequest::Cancelled() {
+ context_->NotifyPermissionSet(id_, requesting_frame_, callback_, false);
+}
+
+void MidiPermissionRequest::RequestFinished() {
+ delete this;
+}
ChromeMidiPermissionContext::ChromeMidiPermissionContext(Profile* profile)
: profile_(profile),
@@ -65,7 +150,7 @@ void ChromeMidiPermissionContext::RequestMidiSysExPermission(
return;
}
- DecidePermission(id, requesting_frame, embedder, callback);
+ DecidePermission(web_contents, id, requesting_frame, embedder, callback);
}
void ChromeMidiPermissionContext::CancelMidiSysExPermissionRequest(
@@ -78,6 +163,7 @@ void ChromeMidiPermissionContext::CancelMidiSysExPermissionRequest(
}
void ChromeMidiPermissionContext::DecidePermission(
+ content::WebContents* web_contents,
const PermissionRequestID& id,
const GURL& requesting_frame,
const GURL& embedder,
@@ -98,6 +184,16 @@ void ChromeMidiPermissionContext::DecidePermission(
PermissionDecided(id, requesting_frame, embedder, callback, true);
break;
default:
+ if (PermissionBubbleManager::Enabled()) {
Ami GONE FROM CHROMIUM 2014/02/06 19:51:17 Can any code be deleted once this is always-on? (p
Greg Billock 2014/02/07 18:20:55 Will do. I have a bug tracking this.
+ PermissionBubbleManager* bubble_manager =
+ PermissionBubbleManager::FromWebContents(web_contents);
+ bubble_manager->AddRequest(new MidiPermissionRequest(
+ this, id, requesting_frame,
+ profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
+ callback));
+ return;
+ }
+
GetQueueController()->CreateInfoBarRequest(
id, requesting_frame, embedder, base::Bind(
&ChromeMidiPermissionContext::NotifyPermissionSet,
@@ -149,5 +245,6 @@ void ChromeMidiPermissionContext::CancelPendingInfobarRequest(
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
if (shutting_down_)
return;
+ // TODO(gbillock): Add support for cancellation to permission bubbles.
Ami GONE FROM CHROMIUM 2014/02/06 19:51:17 What is the usability impact of this lack?
Greg Billock 2014/02/07 18:20:55 Still investigating, but looks minimal, and will g
GetQueueController()->CancelInfoBarRequest(id);
}

Powered by Google App Engine
This is Rietveld 408576698