| Index: content/public/browser/content_browser_client.cc
|
| diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
|
| index 202f943302c32cea7bf4dd710e108978a2a37331..728d8226fa521e119a02020ea649384551366a7f 100644
|
| --- a/content/public/browser/content_browser_client.cc
|
| +++ b/content/public/browser/content_browser_client.cc
|
| @@ -227,7 +227,8 @@ ContentBrowserClient::CheckDesktopNotificationPermission(
|
| return blink::WebNotificationPermissionAllowed;
|
| }
|
|
|
| -void ContentBrowserClient::RequestGeolocationPermission(
|
| +void ContentBrowserClient::RequestPermission(
|
| + PermissionType permission,
|
| WebContents* web_contents,
|
| int bridge_id,
|
| const GURL& requesting_frame,
|
| @@ -236,32 +237,6 @@ void ContentBrowserClient::RequestGeolocationPermission(
|
| result_callback.Run(true);
|
| }
|
|
|
| -// TODO(miguelg): replace all Create*Permission with a single
|
| -// CreatePermission(enum permission) method.
|
| -void ContentBrowserClient::CancelGeolocationPermissionRequest(
|
| - WebContents* web_contents,
|
| - int bridge_id,
|
| - const GURL& requesting_frame) {
|
| -}
|
| -
|
| -void ContentBrowserClient::RequestMidiSysExPermission(
|
| - WebContents* web_contents,
|
| - int bridge_id,
|
| - const GURL& requesting_frame,
|
| - bool user_gesture,
|
| - base::Callback<void(bool)> result_callback,
|
| - base::Closure* cancel_callback) {
|
| - result_callback.Run(true);
|
| -}
|
| -
|
| -void ContentBrowserClient::RequestProtectedMediaIdentifierPermission(
|
| - WebContents* web_contents,
|
| - const GURL& origin,
|
| - base::Callback<void(bool)> result_callback,
|
| - base::Closure* cancel_callback) {
|
| - result_callback.Run(true);
|
| -}
|
| -
|
| bool ContentBrowserClient::CanCreateWindow(
|
| const GURL& opener_url,
|
| const GURL& opener_top_level_frame_url,
|
|
|