| Index: content/shell/browser/shell_content_browser_client.cc
|
| diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
|
| index f7fa9db1c09cc1b9ba658c29aeb2a97eafd1140b..c10761ffab090e45d63913a97b5029ff821ce85b 100644
|
| --- a/content/shell/browser/shell_content_browser_client.cc
|
| +++ b/content/shell/browser/shell_content_browser_client.cc
|
| @@ -12,7 +12,6 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "content/public/browser/client_certificate_delegate.h"
|
| #include "content/public/browser/page_navigator.h"
|
| -#include "content/public/browser/permission_type.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/resource_dispatcher_host.h"
|
| #include "content/public/browser/storage_partition.h"
|
| @@ -297,25 +296,6 @@ void ShellContentBrowserClient::SelectClientCertificate(
|
| select_client_certificate_callback_.Run();
|
| }
|
|
|
| -void ShellContentBrowserClient::RequestPermission(
|
| - PermissionType permission,
|
| - WebContents* web_contents,
|
| - int bridge_id,
|
| - const GURL& requesting_frame,
|
| - bool user_gesture,
|
| - const base::Callback<void(PermissionStatus)>& callback) {
|
| - // Some Geolocation tests on Android are still expecting to have the
|
| - // permission granted. See https://crbug.com/463514.
|
| - if (permission == PermissionType::GEOLOCATION) {
|
| - callback.Run(PERMISSION_STATUS_GRANTED);
|
| - return;
|
| - }
|
| -
|
| - ContentBrowserClient::RequestPermission(
|
| - permission, web_contents, bridge_id,
|
| - requesting_frame, user_gesture, callback);
|
| -}
|
| -
|
| SpeechRecognitionManagerDelegate*
|
| ShellContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
|
| return new ShellSpeechRecognitionManagerDelegate();
|
|
|