mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Rename content::PermissionManager into content::PermissionControllerDelegate

Browse source 
1136858
This commit is contained in:
Jeremy Apthorp 2018-10-02 14:53:10 -07:00
parent 7861f75a3e
commit af03e4a962
6 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_session.cc
View file

@ -547,7 +547,7 @@ void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
return; return;
} }
auto* permission_manager = static_cast<AtomPermissionManager*>( auto* permission_manager = static_cast<AtomPermissionManager*>(
browser_context()->GetPermissionManager()); browser_context()->GetPermissionControllerDelegate());
permission_manager->SetPermissionRequestHandler(handler); permission_manager->SetPermissionRequestHandler(handler);
} }
@ -559,7 +559,7 @@ void Session::SetPermissionCheckHandler(v8::Local<v8::Value> val,
return; return;
} }
auto* permission_manager = static_cast<AtomPermissionManager*>( auto* permission_manager = static_cast<AtomPermissionManager*>(
browser_context()->GetPermissionManager()); browser_context()->GetPermissionControllerDelegate());
permission_manager->SetPermissionCheckHandler(handler); permission_manager->SetPermissionCheckHandler(handler);
} }

3
atom/browser/atom_browser_context.cc
View file

@ -234,7 +234,8 @@ content::BrowserPluginGuestManager* AtomBrowserContext::GetGuestManager() {
return guest_manager_.get(); return guest_manager_.get();
} }
content::PermissionManager* AtomBrowserContext::GetPermissionManager() { content::PermissionControllerDelegate*
AtomBrowserContext::GetPermissionControllerDelegate() {
if (!permission_manager_.get()) if (!permission_manager_.get())
permission_manager_.reset(new AtomPermissionManager); permission_manager_.reset(new AtomPermissionManager);
return permission_manager_.get(); return permission_manager_.get();

3
atom/browser/atom_browser_context.h
View file

@ -81,7 +81,8 @@ class AtomBrowserContext
std::string GetMediaDeviceIDSalt() override; std::string GetMediaDeviceIDSalt() override;
content::DownloadManagerDelegate* GetDownloadManagerDelegate() override; content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
content::BrowserPluginGuestManager* GetGuestManager() override; content::BrowserPluginGuestManager* GetGuestManager() override;
content::PermissionManager* GetPermissionManager() override; content::PermissionControllerDelegate* GetPermissionControllerDelegate()
override;
storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override; storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
net::URLRequestContextGetter* CreateRequestContext( net::URLRequestContextGetter* CreateRequestContext(
content::ProtocolHandlerMap* protocol_handlers, content::ProtocolHandlerMap* protocol_handlers,

1
atom/browser/atom_permission_manager.cc
View file

@ -11,6 +11,7 @@
#include "atom/browser/atom_browser_main_parts.h" #include "atom/browser/atom_browser_main_parts.h"
#include "atom/browser/web_contents_preferences.h" #include "atom/browser/web_contents_preferences.h"
#include "content/public/browser/child_process_security_policy.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/permission_type.h"
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"

8
atom/browser/atom_permission_manager.h
View file

@ -12,7 +12,7 @@
#include "base/callback.h" #include "base/callback.h"
#include "base/containers/id_map.h" #include "base/containers/id_map.h"
#include "base/values.h" #include "base/values.h"
#include "content/public/browser/permission_manager.h" #include "content/public/browser/permission_controller_delegate.h"
namespace content { namespace content {
class WebContents; class WebContents;
@ -20,7 +20,7 @@ class WebContents;
namespace atom { namespace atom {
class AtomPermissionManager : public content::PermissionManager { class AtomPermissionManager : public content::PermissionControllerDelegate {
public: public:
AtomPermissionManager(); AtomPermissionManager();
~AtomPermissionManager() override; ~AtomPermissionManager() override;
@ -41,7 +41,7 @@ class AtomPermissionManager : public content::PermissionManager {
void SetPermissionRequestHandler(const RequestHandler& handler); void SetPermissionRequestHandler(const RequestHandler& handler);
void SetPermissionCheckHandler(const CheckHandler& handler); void SetPermissionCheckHandler(const CheckHandler& handler);
// content::PermissionManager: // content::PermissionControllerDelegate:
int RequestPermission( int RequestPermission(
content::PermissionType permission, content::PermissionType permission,
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
@ -87,7 +87,7 @@ class AtomPermissionManager : public content::PermissionManager {
int permission_id, int permission_id,
blink::mojom::PermissionStatus status); blink::mojom::PermissionStatus status);
// content::PermissionManager: // content::PermissionControllerDelegate:
void ResetPermission(content::PermissionType permission, void ResetPermission(content::PermissionType permission,
const GURL& requesting_origin, const GURL& requesting_origin,
const GURL& embedding_origin) override; const GURL& embedding_origin) override;

4
atom/browser/web_contents_permission_helper.cc
View file

@ -74,7 +74,7 @@ void WebContentsPermissionHelper::RequestPermission(
const base::DictionaryValue* details) { const base::DictionaryValue* details) {
auto* rfh = web_contents_->GetMainFrame(); auto* rfh = web_contents_->GetMainFrame();
auto* permission_manager = static_cast<AtomPermissionManager*>( auto* permission_manager = static_cast<AtomPermissionManager*>(
web_contents_->GetBrowserContext()->GetPermissionManager()); web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
auto origin = web_contents_->GetLastCommittedURL(); auto origin = web_contents_->GetLastCommittedURL();
permission_manager->RequestPermissionWithDetails( permission_manager->RequestPermissionWithDetails(
permission, rfh, origin, false, details, permission, rfh, origin, false, details,
@ -86,7 +86,7 @@ bool WebContentsPermissionHelper::CheckPermission(
const base::DictionaryValue* details) const { const base::DictionaryValue* details) const {
auto* rfh = web_contents_->GetMainFrame(); auto* rfh = web_contents_->GetMainFrame();
auto* permission_manager = static_cast<AtomPermissionManager*>( auto* permission_manager = static_cast<AtomPermissionManager*>(
web_contents_->GetBrowserContext()->GetPermissionManager()); web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
auto origin = web_contents_->GetLastCommittedURL(); auto origin = web_contents_->GetLastCommittedURL();
return permission_manager->CheckPermissionWithDetails(permission, rfh, origin, return permission_manager->CheckPermissionWithDetails(permission, rfh, origin,
details); details);