args->ThrowError("Must pass null or function");
return;
}
- GetBrowserContext()->permission_manager()
- ->SetPermissionRequestHandler(GetID(), handler);
+ auto permission_manager = static_cast<AtomPermissionManager*>(
+ web_contents()->GetBrowserContext()->GetPermissionManager());
+ permission_manager->SetPermissionRequestHandler(GetID(), handler);
}
v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
AtomBrowserContext::AtomBrowserContext(const std::string& partition,
bool in_memory)
: brightray::BrowserContext(partition, in_memory),
- permission_manager_(new AtomPermissionManager),
cert_verifier_(nullptr),
job_factory_(new AtomURLRequestJobFactory),
network_delegate_(new AtomNetworkDelegate),
}
content::PermissionManager* AtomBrowserContext::GetPermissionManager() {
+ if (!permission_manager_.get())
+ permission_manager_.reset(new AtomPermissionManager);
return permission_manager_.get();
}
AtomNetworkDelegate* network_delegate() const { return network_delegate_; }
- AtomPermissionManager* permission_manager() const {
- return permission_manager_.get();
- }
-
private:
scoped_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
scoped_ptr<WebViewManager> guest_manager_;
#include <string>
#include "atom/browser/atom_permission_manager.h"
+#include "content/public/browser/browser_context.h"
#include "content/public/browser/media_capture_devices.h"
#include "content/public/browser/render_process_host.h"
content::PermissionType permission,
const base::Callback<void(bool)>& callback) {
auto rfh = web_contents_->GetMainFrame();
- auto permission_manager = browser_context()->permission_manager();
+ auto permission_manager = static_cast<AtomPermissionManager*>(
+ web_contents_->GetBrowserContext()->GetPermissionManager());
auto origin = web_contents_->GetLastCommittedURL();
permission_manager->RequestPermission(permission, rfh, origin, callback);
}
#ifndef ATOM_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
#define ATOM_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
-#include "atom/browser/atom_browser_context.h"
#include "content/public/browser/permission_type.h"
#include "content/public/browser/web_contents_user_data.h"
#include "content/public/common/media_stream_request.h"
void RequestWebNotificationPermission(
const base::Callback<void(bool)>& callback);
- AtomBrowserContext* browser_context() const {
- return static_cast<AtomBrowserContext*>(web_contents_->GetBrowserContext());
- }
-
private:
explicit WebContentsPermissionHelper(content::WebContents* web_contents);
friend class content::WebContentsUserData<WebContentsPermissionHelper>;