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

Replace a few calls to AtomBrowserMainParts::Get.

Browse source 
These calls replies on global BrowserContext, we can just make them use
the future default BrowserContext.
This commit is contained in:
Cheng Zhao 2015-06-18 17:01:23 +08:00
parent b47fae7393
commit e209312459
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@
#include "atom/browser/api/atom_api_menu.h"
#include "atom/browser/atom_browser_context.h"
#include "atom/browser/atom_browser_main_parts.h"
#include "atom/browser/browser.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/gurl_converter.h"
@ -97,7 +98,8 @@ class ResolveProxyHelper {
public:
ResolveProxyHelper(const GURL& url, App::ResolveProxyCallback callback)
: callback_(callback) {
net::ProxyService* proxy_service = AtomBrowserContext::Get()->
auto browser_context = AtomBrowserMainParts::Get()->browser_context();
net::ProxyService* proxy_service = browser_context->
url_request_context_getter()->GetURLRequestContext()->proxy_service();
// Start the request.

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

@ -8,6 +8,7 @@
#include "atom/browser/atom_browser_client.h"
#include "atom/browser/atom_browser_context.h"
#include "atom/browser/atom_browser_main_parts.h"
#include "atom/browser/native_window.h"
#include "atom/common/api/api_messages.h"
#include "atom/common/native_mate_converters/gfx_converter.h"
@ -144,7 +145,7 @@ WebContents::WebContents(const mate::Dictionary& options)
guest_host_(nullptr),
auto_size_enabled_(false),
is_full_page_plugin_(false) {
auto browser_context = AtomBrowserContext::Get();
auto browser_context = AtomBrowserMainParts::Get()->browser_context();
content::SiteInstance* site_instance = content::SiteInstance::CreateForURL(
browser_context, GURL("chrome-guest://fake-host"));