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

Fix compilation warnings due to API changes

Browse source
This commit is contained in:
Cheng Zhao 2014-12-06 22:16:00 -08:00
parent 289d3b54f3
commit 2c81fb4719
6 changed files with 20 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

22
brightray/browser/browser_context.cc
View file

@ -45,18 +45,6 @@ class BrowserContext::ResourceContext : public content::ResourceContext {
return getter_->GetURLRequestContext();
}
// FIXME: We should probably allow clients to override this to implement more
// restrictive policies.
virtual bool AllowMicAccess(const GURL& origin) override {
return true;
}
// FIXME: We should probably allow clients to override this to implement more
// restrictive policies.
virtual bool AllowCameraAccess(const GURL& origin) override {
return true;
}
URLRequestContextGetter* getter_;
};
@ -80,13 +68,13 @@ void BrowserContext::Initialize() {
base::PrefServiceFactory prefs_factory;
prefs_factory.SetUserPrefsFile(prefs_path,
JsonPrefStore::GetTaskRunnerForFile(
prefs_path, BrowserThread::GetBlockingPool()));
prefs_path, BrowserThread::GetBlockingPool()).get());
auto registry = make_scoped_refptr(new PrefRegistrySimple);
RegisterInternalPrefs(registry);
RegisterPrefs(registry);
RegisterInternalPrefs(registry.get());
RegisterPrefs(registry.get());
prefs_ = prefs_factory.Create(registry);
prefs_ = prefs_factory.Create(registry.get());
}
BrowserContext::~BrowserContext() {
@ -102,7 +90,7 @@ void BrowserContext::RegisterInternalPrefs(PrefRegistrySimple* registry) {
net::URLRequestContextGetter* BrowserContext::CreateRequestContext(
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector protocol_interceptors) {
DCHECK(!url_request_getter_);
DCHECK(!url_request_getter_.get());
url_request_getter_ = new URLRequestContextGetter(
this,
GetPath(),