X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fmedia%2Fchrome_midi_permission_context.h;h=a868e453cdc7e713391936ba4c1032a0427e35d4;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=e5fde09054c562b0fa50ef4ffbf1a29958a8d9c0;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/browser/media/chrome_midi_permission_context.h b/src/chrome/browser/media/chrome_midi_permission_context.h
index e5fde09..a868e45 100644
--- a/src/chrome/browser/media/chrome_midi_permission_context.h
+++ b/src/chrome/browser/media/chrome_midi_permission_context.h
@@ -9,58 +9,64 @@
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/browser_context.h"
 
+namespace content {
+class WebContents;
+}
+
 class GURL;
 class PermissionQueueController;
 class PermissionRequestID;
 class Profile;
 
 // This class manages MIDI permissions flow. Used on the UI thread.
-class ChromeMIDIPermissionContext : public BrowserContextKeyedService {
+class ChromeMidiPermissionContext : public BrowserContextKeyedService {
  public:
-  explicit ChromeMIDIPermissionContext(Profile* profile);
-  virtual ~ChromeMIDIPermissionContext();
+  explicit ChromeMidiPermissionContext(Profile* profile);
+  virtual ~ChromeMidiPermissionContext();
 
   // BrowserContextKeyedService methods:
   virtual void Shutdown() OVERRIDE;
 
   // Request to ask users permission about MIDI.
-  void RequestMIDISysExPermission(
+  void RequestMidiSysExPermission(
       int render_process_id,
       int render_view_id,
       int bridge_id,
       const GURL& requesting_frame,
-      const content::BrowserContext::MIDISysExPermissionCallback& callback);
+      const content::BrowserContext::MidiSysExPermissionCallback& callback);
 
   // Cancel a pending MIDI permission request.
-  void CancelMIDISysExPermissionRequest(int render_process_id,
+  void CancelMidiSysExPermissionRequest(int render_process_id,
                                         int render_view_id,
                                         int bridge_id,
                                         const GURL& requesting_frame);
 
+  // Called when the permission decision is made. If a permissions prompt is
+  // shown to the user it will be called when the user selects an option
+  // from that prompt.
+  void NotifyPermissionSet(
+      const PermissionRequestID& id,
+      const GURL& requesting_frame,
+      const content::BrowserContext::MidiSysExPermissionCallback& callback,
+      bool allowed);
+
  private:
   // Decide whether the permission should be granted.
   // Calls PermissionDecided if permission can be decided non-interactively,
   // or NotifyPermissionSet if permission decided by presenting an infobar.
   void DecidePermission(
+      content::WebContents* web_contents,
       const PermissionRequestID& id,
       const GURL& requesting_frame,
       const GURL& embedder,
-      const content::BrowserContext::MIDISysExPermissionCallback& callback);
+      const content::BrowserContext::MidiSysExPermissionCallback& callback);
 
   // Called when permission is granted without interactively asking the user.
   void PermissionDecided(
       const PermissionRequestID& id,
       const GURL& requesting_frame,
       const GURL& embedder,
-      const content::BrowserContext::MIDISysExPermissionCallback& callback,
-      bool allowed);
-
-  // Called when the permission decision is made. It may be by the
-  // InfoBarDelegate to notify permission has been set.
-  void NotifyPermissionSet(
-      const PermissionRequestID& id,
-      const GURL& requesting_frame,
-      const content::BrowserContext::MIDISysExPermissionCallback& callback,
+      const content::BrowserContext::MidiSysExPermissionCallback& callback,
       bool allowed);
 
   // Return an instance of the infobar queue controller, creating it if needed.
@@ -73,7 +79,7 @@ class ChromeMIDIPermissionContext : public BrowserContextKeyedService {
   bool shutting_down_;
   scoped_ptr<PermissionQueueController> permission_queue_controller_;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeMIDIPermissionContext);
+  DISALLOW_COPY_AND_ASSIGN(ChromeMidiPermissionContext);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_CHROME_MIDI_PERMISSION_CONTEXT_H_