Merge pull request #304 from brave/browser-issue-10864

handle permission requests for multiple permissions
brave · Sep 11, 2017 · 7bd7077 · 7bd7077
2 parents 4e45db9 + bffa754
commit 7bd7077
Show file tree

Hide file tree

Showing 13 changed files with 106 additions and 435 deletions.
diff --git a/atom/browser/BUILD.gn b/atom/browser/BUILD.gn
@@ -97,8 +97,6 @@ source_set("browser") {
     "atom_download_manager_delegate.h",
     "atom_browser_main_parts.cc",
     "atom_browser_main_parts.h",
-    "atom_permission_manager.cc",
-    "atom_permission_manager.h",
     "atom_quota_permission_context.cc",
     "atom_quota_permission_context.h",
     "atom_resource_dispatcher_host_delegate.cc",

diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc
@@ -9,7 +9,6 @@
 #include "atom/browser/api/atom_api_protocol.h"
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_download_manager_delegate.h"
-#include "atom/browser/atom_permission_manager.h"
 #include "atom/browser/browser.h"
 #include "atom/browser/net/asar/asar_protocol_handler.h"
 #include "atom/browser/net/atom_cert_verifier.h"
@@ -137,12 +136,6 @@ AtomBrowserContext::GetDownloadManagerDelegate() {
   return download_manager_delegate_.get();
 }
 
-content::PermissionManager* AtomBrowserContext::GetPermissionManager() {
-  if (!permission_manager_.get())
-    permission_manager_.reset(new AtomPermissionManager);
-  return permission_manager_.get();
-}
-
 std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier() {
   return base::WrapUnique(new AtomCertVerifier);
 }

diff --git a/atom/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h
@@ -15,7 +15,6 @@
 namespace atom {
 
 class AtomDownloadManagerDelegate;
-class AtomPermissionManager;
 
 class AtomBrowserContext : public brightray::BrowserContext {
  public:
@@ -38,7 +37,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
 
   // content::BrowserContext:
   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-  content::PermissionManager* GetPermissionManager() override;
 
   // brightray::BrowserContext:
   void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
@@ -53,7 +51,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
 
  private:
   std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-  std::unique_ptr<AtomPermissionManager> permission_manager_;
   bool use_cache_;
 
   // Managed by brightray::BrowserContext.

diff --git a/atom/browser/atom_permission_manager.cc b/atom/browser/atom_permission_manager.cc
diff --git a/atom/browser/atom_permission_manager.h b/atom/browser/atom_permission_manager.h
diff --git a/atom/browser/web_contents_permission_helper.cc b/atom/browser/web_contents_permission_helper.cc
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "atom/browser/atom_permission_manager.h"
+#include "brave/browser/brave_permission_manager.h"
 #include "brightray/browser/media/media_stream_devices_controller.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_process_host.h"
@@ -57,7 +57,7 @@ void WebContentsPermissionHelper::RequestPermission(
     const base::Callback<void(bool)>& callback,
     const GURL& security_origin, bool user_gesture) {
   auto rfh = web_contents_->GetMainFrame();
-  auto permission_manager = static_cast<AtomPermissionManager*>(
+  auto permission_manager = static_cast<brave::BravePermissionManager*>(
       web_contents_->GetBrowserContext()->GetPermissionManager());
   GURL origin;
   if (security_origin.is_empty()) {