Group the different permission related methods in the content api.

chrome/browser/chrome_content_browser_client.h

Index: chrome/browser/chrome_content_browser_client.h
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 1c7d5117e3a77295193fead1b0b908280bff9abf..a7cddd62ccd02e920a04c9bc0730ac2e64865a82 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -184,11 +184,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
                               int render_process_id,
                               int render_frame_id) override;
   virtual content::MediaObserver* GetMediaObserver() override;
-  virtual void RequestDesktopNotificationPermission(
-      const GURL& source_origin,
-      content::RenderFrameHost* render_frame_host,
-      const base::Callback<void(blink::WebNotificationPermission)>& callback)
-          override;
   virtual blink::WebNotificationPermission
       CheckDesktopNotificationPermission(
           const GURL& source_origin,
@@ -199,31 +194,26 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       content::RenderFrameHost* render_frame_host,
       scoped_ptr<content::DesktopNotificationDelegate> delegate,
       base::Closure* cancel_callback) override;
-  virtual void RequestGeolocationPermission(
-      content::WebContents* web_contents,
-      int bridge_id,
-      const GURL& requesting_frame,
-      bool user_gesture,
-      const base::Callback<void(bool)>& result_callback) override;
-  virtual void CancelGeolocationPermissionRequest(
+  virtual void RequestPermission(
+       content::PermissionType permission,
+       content::WebContents* web_contents,
+       int bridge_id,
+       const GURL& requesting_frame,
+       bool user_gesture,
+       const base::Callback<void(bool)>& result_callback) override;

[Peter Beverloo, 2014/10/20 17:32:16]

5-space indent??

Also, please remove the blank lines on lines 204, 210 and 216, since this is a
list of overrides.

[Miguel Garcia, 2014/10/21 17:17:12]

Done.

+
+  virtual void CancelPermissionRequest(
+      content::PermissionType permission,
       content::WebContents* web_contents,
       int bridge_id,
       const GURL& requesting_frame) override;
-  virtual void RequestMidiSysExPermission(
-      content::WebContents* web_contents,
-      int bridge_id,
-      const GURL& requesting_frame,
-      bool user_gesture,
-      base::Callback<void(bool)> result_callback,
-      base::Closure* cancel_callback) override;
-  virtual void DidUseGeolocationPermission(content::WebContents* web_contents,
-                                           const GURL& frame_url,
-                                           const GURL& main_frame_url) override;
-  virtual void RequestProtectedMediaIdentifierPermission(
+
+  virtual void RegisterPermissionUsage(
+      content::PermissionType permission,
       content::WebContents* web_contents,
-      const GURL& origin,
-      base::Callback<void(bool)> result_callback,
-      base::Closure* cancel_callback) override;
+      const GURL& frame_url,
+      const GURL& main_frame_url) override;
+
   virtual bool CanCreateWindow(const GURL& opener_url,
                                const GURL& opener_top_level_frame_url,
                                const GURL& source_origin,