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

Adapt to changes of Chrome 51 API changes (Part 2)

Browse source
This commit is contained in:
Cheng Zhao 2016-05-23 12:28:41 +09:00
parent 851ef398fb
commit 76d180a80d
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
brightray/browser/browser_context.cc
View file

@ -143,7 +143,7 @@ net::URLRequestContextGetter* BrowserContext::CreateRequestContext(
url_request_getter_ = new URLRequestContextGetter( url_request_getter_ = new URLRequestContextGetter(
this, this,
network_controller_handle(), network_controller_handle(),
net_log_, &net_log_,
GetPath(), GetPath(),
in_memory_, in_memory_,
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO), BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
@ -226,4 +226,13 @@ content::BackgroundSyncController* BrowserContext::GetBackgroundSyncController()
return nullptr; return nullptr;
} }
net::URLRequestContextGetter*
BrowserContext::CreateRequestContextForStoragePartition(
const base::FilePath& partition_path,
bool in_memory,
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors) {
return nullptr;
}
} // namespace brightray } // namespace brightray

5
brightray/browser/browser_context.h
View file

@ -61,6 +61,11 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
net::URLRequestContextGetter* CreateRequestContext( net::URLRequestContextGetter* CreateRequestContext(
content::ProtocolHandlerMap* protocol_handlers, content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors) override; content::URLRequestInterceptorScopedVector request_interceptors) override;
net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
const base::FilePath& partition_path,
bool in_memory,
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors) override;
net::URLRequestContextGetter* url_request_context_getter() const { net::URLRequestContextGetter* url_request_context_getter() const {
return url_request_getter_.get(); return url_request_getter_.get();

2
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -190,7 +190,7 @@ InspectableWebContentsView* CreateInspectableContentsView(
InspectableWebContentsImpl* inspectable_web_contents_impl); InspectableWebContentsImpl* inspectable_web_contents_impl);
void InspectableWebContentsImpl::RegisterPrefs(PrefRegistrySimple* registry) { void InspectableWebContentsImpl::RegisterPrefs(PrefRegistrySimple* registry) {
auto bounds_dict = make_std::unique_ptr(new base::DictionaryValue); std::unique_ptr<base::DictionaryValue> bounds_dict(new base::DictionaryValue);
RectToDictionary(gfx::Rect(0, 0, 800, 600), bounds_dict.get()); RectToDictionary(gfx::Rect(0, 0, 800, 600), bounds_dict.get());
registry->RegisterDictionaryPref(kDevToolsBoundsPref, bounds_dict.release()); registry->RegisterDictionaryPref(kDevToolsBoundsPref, bounds_dict.release());
registry->RegisterDoublePref(kDevToolsZoomPref, 0.); registry->RegisterDoublePref(kDevToolsZoomPref, 0.);