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

remove unnecessary getter

Browse source
This commit is contained in:
Robo 2016-02-01 00:43:29 +05:30
parent f7556de9fb
commit 04c3e083fb
5 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_web_contents.cc
View file

@ -1074,8 +1074,9 @@ void WebContents::SetPermissionRequestHandler(v8::Local<v8::Value> val,
args->ThrowError("Must pass null or function"); args->ThrowError("Must pass null or function");
return; return;
} }
GetBrowserContext()->permission_manager() auto permission_manager = static_cast<AtomPermissionManager*>(
->SetPermissionRequestHandler(GetID(), handler); web_contents()->GetBrowserContext()->GetPermissionManager());
permission_manager->SetPermissionRequestHandler(GetID(), handler);
} }
v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) { v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {

3
atom/browser/atom_browser_context.cc
View file

@ -65,7 +65,6 @@ std::string RemoveWhitespace(const std::string& str) {
AtomBrowserContext::AtomBrowserContext(const std::string& partition, AtomBrowserContext::AtomBrowserContext(const std::string& partition,
bool in_memory) bool in_memory)
: brightray::BrowserContext(partition, in_memory), : brightray::BrowserContext(partition, in_memory),
permission_manager_(new AtomPermissionManager),
cert_verifier_(nullptr), cert_verifier_(nullptr),
job_factory_(new AtomURLRequestJobFactory), job_factory_(new AtomURLRequestJobFactory),
network_delegate_(new AtomNetworkDelegate), network_delegate_(new AtomNetworkDelegate),
@ -172,6 +171,8 @@ content::BrowserPluginGuestManager* AtomBrowserContext::GetGuestManager() {
} }
content::PermissionManager* AtomBrowserContext::GetPermissionManager() { content::PermissionManager* AtomBrowserContext::GetPermissionManager() {
if (!permission_manager_.get())
permission_manager_.reset(new AtomPermissionManager);
return permission_manager_.get(); return permission_manager_.get();
} }

4
atom/browser/atom_browser_context.h
View file

@ -51,10 +51,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
AtomNetworkDelegate* network_delegate() const { return network_delegate_; } AtomNetworkDelegate* network_delegate() const { return network_delegate_; }
AtomPermissionManager* permission_manager() const {
return permission_manager_.get();
}
private: private:
scoped_ptr<AtomDownloadManagerDelegate> download_manager_delegate_; scoped_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
scoped_ptr<WebViewManager> guest_manager_; scoped_ptr<WebViewManager> guest_manager_;

4
atom/browser/web_contents_permission_helper.cc
View file

@ -7,6 +7,7 @@
#include <string> #include <string>
#include "atom/browser/atom_permission_manager.h" #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/media_capture_devices.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
@ -79,7 +80,8 @@ void WebContentsPermissionHelper::RequestPermission(
content::PermissionType permission, content::PermissionType permission,
const base::Callback<void(bool)>& callback) { const base::Callback<void(bool)>& callback) {
auto rfh = web_contents_->GetMainFrame(); 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(); auto origin = web_contents_->GetLastCommittedURL();
permission_manager->RequestPermission(permission, rfh, origin, callback); permission_manager->RequestPermission(permission, rfh, origin, callback);
} }

5
atom/browser/web_contents_permission_helper.h
View file

@ -5,7 +5,6 @@
#ifndef ATOM_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_ #ifndef ATOM_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
#define 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/permission_type.h"
#include "content/public/browser/web_contents_user_data.h" #include "content/public/browser/web_contents_user_data.h"
#include "content/public/common/media_stream_request.h" #include "content/public/common/media_stream_request.h"
@ -24,10 +23,6 @@ class WebContentsPermissionHelper
void RequestWebNotificationPermission( void RequestWebNotificationPermission(
const base::Callback<void(bool)>& callback); const base::Callback<void(bool)>& callback);
AtomBrowserContext* browser_context() const {
return static_cast<AtomBrowserContext*>(web_contents_->GetBrowserContext());
}
private: private:
explicit WebContentsPermissionHelper(content::WebContents* web_contents); explicit WebContentsPermissionHelper(content::WebContents* web_contents);
friend class content::WebContentsUserData<WebContentsPermissionHelper>; friend class content::WebContentsUserData<WebContentsPermissionHelper>;