chrome/browser/chrome_content_browser_client.h - Issue 622793002: Group the different permission related methods in the content api.

Unified Diff: chrome/browser/chrome_content_browser_client.h

Issue 622793002: Group the different permission related methods in the content api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 2 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

« no previous file with comments | « android_webview/browser/aw_content_browser_client.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | content/browser/media/cdm/browser_cdm_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 cbd7382e5fe65914652fb4db217a299641969ac0..2f019078e6f9950d400e5924126e36b7e6d378fa 100644

--- a/chrome/browser/chrome_content_browser_client.h

+++ b/chrome/browser/chrome_content_browser_client.h

@@ -180,11 +180,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

int render_process_id,

int render_frame_id) override;

content::MediaObserver* GetMediaObserver() override;

- void RequestDesktopNotificationPermission(

- const GURL& source_origin,

- content::RenderFrameHost* render_frame_host,

- const base::Callback<void(blink::WebNotificationPermission)>& callback)

- override;

blink::WebNotificationPermission CheckDesktopNotificationPermission(

const GURL& source_origin,

content::ResourceContext* context,

@@ -194,30 +189,21 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

content::RenderFrameHost* render_frame_host,

scoped_ptr<content::DesktopNotificationDelegate> delegate,

base::Closure* cancel_callback) override;

- void RequestGeolocationPermission(

+ 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;

- void CancelGeolocationPermissionRequest(

- content::WebContents* web_contents,

- int bridge_id,

- const GURL& requesting_frame) override;

- 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;

- void DidUseGeolocationPermission(content::WebContents* web_contents,

- const GURL& frame_url,

- const GURL& main_frame_url) override;

- void RequestProtectedMediaIdentifierPermission(

- content::WebContents* web_contents,

- const GURL& origin,

- base::Callback<void(bool)> result_callback,

- base::Closure* cancel_callback) override;

+ void CancelPermissionRequest(content::PermissionType permission,

+ content::WebContents* web_contents,

+ int bridge_id,

+ const GURL& requesting_frame) override;

+ void RegisterPermissionUsage(content::PermissionType permission,

+ content::WebContents* web_contents,

+ const GURL& frame_url,

+ const GURL& main_frame_url) override;

bool CanCreateWindow(const GURL& opener_url,

const GURL& opener_top_level_frame_url,

const GURL& source_origin,