From af03e4a96263b9fa2020489fa143e2cc85287626 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 2 Oct 2018 14:53:10 -0700 Subject: [PATCH] Rename content::PermissionManager into content::PermissionControllerDelegate https://chromium-review.googlesource.com/c/chromium/src/+/1136858 --- atom/browser/api/atom_api_session.cc | 4 ++-- atom/browser/atom_browser_context.cc | 3 ++- atom/browser/atom_browser_context.h | 3 ++- atom/browser/atom_permission_manager.cc | 1 + atom/browser/atom_permission_manager.h | 8 ++++---- atom/browser/web_contents_permission_helper.cc | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index b686dc42b1f4..f3ee77b9241b 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/atom/browser/api/atom_api_session.cc @@ -547,7 +547,7 @@ void Session::SetPermissionRequestHandler(v8::Local val, return; } auto* permission_manager = static_cast( - browser_context()->GetPermissionManager()); + browser_context()->GetPermissionControllerDelegate()); permission_manager->SetPermissionRequestHandler(handler); } @@ -559,7 +559,7 @@ void Session::SetPermissionCheckHandler(v8::Local val, return; } auto* permission_manager = static_cast( - browser_context()->GetPermissionManager()); + browser_context()->GetPermissionControllerDelegate()); permission_manager->SetPermissionCheckHandler(handler); } diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc index 8528d2bbf183..fff0e85f2a83 100644 --- a/atom/browser/atom_browser_context.cc +++ b/atom/browser/atom_browser_context.cc @@ -234,7 +234,8 @@ content::BrowserPluginGuestManager* AtomBrowserContext::GetGuestManager() { return guest_manager_.get(); } -content::PermissionManager* AtomBrowserContext::GetPermissionManager() { +content::PermissionControllerDelegate* +AtomBrowserContext::GetPermissionControllerDelegate() { if (!permission_manager_.get()) permission_manager_.reset(new AtomPermissionManager); return permission_manager_.get(); diff --git a/atom/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h index c58377b78fd9..01e8208aa72d 100644 --- a/atom/browser/atom_browser_context.h +++ b/atom/browser/atom_browser_context.h @@ -81,7 +81,8 @@ class AtomBrowserContext std::string GetMediaDeviceIDSalt() override; content::DownloadManagerDelegate* GetDownloadManagerDelegate() override; content::BrowserPluginGuestManager* GetGuestManager() override; - content::PermissionManager* GetPermissionManager() override; + content::PermissionControllerDelegate* GetPermissionControllerDelegate() + override; storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override; net::URLRequestContextGetter* CreateRequestContext( content::ProtocolHandlerMap* protocol_handlers, diff --git a/atom/browser/atom_permission_manager.cc b/atom/browser/atom_permission_manager.cc index 9e1238915ba3..b789bde648af 100644 --- a/atom/browser/atom_permission_manager.cc +++ b/atom/browser/atom_permission_manager.cc @@ -11,6 +11,7 @@ #include "atom/browser/atom_browser_main_parts.h" #include "atom/browser/web_contents_preferences.h" #include "content/public/browser/child_process_security_policy.h" +#include "content/public/browser/permission_controller.h" #include "content/public/browser/permission_type.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" diff --git a/atom/browser/atom_permission_manager.h b/atom/browser/atom_permission_manager.h index 843fb79ee895..605db56bedcc 100644 --- a/atom/browser/atom_permission_manager.h +++ b/atom/browser/atom_permission_manager.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/containers/id_map.h" #include "base/values.h" -#include "content/public/browser/permission_manager.h" +#include "content/public/browser/permission_controller_delegate.h" namespace content { class WebContents; @@ -20,7 +20,7 @@ class WebContents; namespace atom { -class AtomPermissionManager : public content::PermissionManager { +class AtomPermissionManager : public content::PermissionControllerDelegate { public: AtomPermissionManager(); ~AtomPermissionManager() override; @@ -41,7 +41,7 @@ class AtomPermissionManager : public content::PermissionManager { void SetPermissionRequestHandler(const RequestHandler& handler); void SetPermissionCheckHandler(const CheckHandler& handler); - // content::PermissionManager: + // content::PermissionControllerDelegate: int RequestPermission( content::PermissionType permission, content::RenderFrameHost* render_frame_host, @@ -87,7 +87,7 @@ class AtomPermissionManager : public content::PermissionManager { int permission_id, blink::mojom::PermissionStatus status); - // content::PermissionManager: + // content::PermissionControllerDelegate: void ResetPermission(content::PermissionType permission, const GURL& requesting_origin, const GURL& embedding_origin) override; diff --git a/atom/browser/web_contents_permission_helper.cc b/atom/browser/web_contents_permission_helper.cc index 7d302815c106..f62b38268918 100644 --- a/atom/browser/web_contents_permission_helper.cc +++ b/atom/browser/web_contents_permission_helper.cc @@ -74,7 +74,7 @@ void WebContentsPermissionHelper::RequestPermission( const base::DictionaryValue* details) { auto* rfh = web_contents_->GetMainFrame(); auto* permission_manager = static_cast( - web_contents_->GetBrowserContext()->GetPermissionManager()); + web_contents_->GetBrowserContext()->GetPermissionControllerDelegate()); auto origin = web_contents_->GetLastCommittedURL(); permission_manager->RequestPermissionWithDetails( permission, rfh, origin, false, details, @@ -86,7 +86,7 @@ bool WebContentsPermissionHelper::CheckPermission( const base::DictionaryValue* details) const { auto* rfh = web_contents_->GetMainFrame(); auto* permission_manager = static_cast( - web_contents_->GetBrowserContext()->GetPermissionManager()); + web_contents_->GetBrowserContext()->GetPermissionControllerDelegate()); auto origin = web_contents_->GetLastCommittedURL(); return permission_manager->CheckPermissionWithDetails(permission, rfh, origin, details);