Fix cpplint errors in browser_context.cc
This commit is contained in:
parent
101a7bfa21
commit
cc4aeb995b
1 changed files with 37 additions and 18 deletions
|
@ -2,11 +2,12 @@
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
// found in the LICENSE-CHROMIUM file.
|
// found in the LICENSE-CHROMIUM file.
|
||||||
|
|
||||||
#include "browser_context.h"
|
#include "browser/browser_context.h"
|
||||||
|
|
||||||
#include "browser/download_manager_delegate.h"
|
#include "browser/download_manager_delegate.h"
|
||||||
#include "browser/inspectable_web_contents_impl.h"
|
#include "browser/inspectable_web_contents_impl.h"
|
||||||
#include "browser/network_delegate.h"
|
#include "browser/network_delegate.h"
|
||||||
|
#include "browser/url_request_context_getter.h"
|
||||||
#include "common/application_info.h"
|
#include "common/application_info.h"
|
||||||
|
|
||||||
#include "base/environment.h"
|
#include "base/environment.h"
|
||||||
|
@ -19,7 +20,6 @@
|
||||||
#include "content/public/browser/browser_thread.h"
|
#include "content/public/browser/browser_thread.h"
|
||||||
#include "content/public/browser/resource_context.h"
|
#include "content/public/browser/resource_context.h"
|
||||||
#include "content/public/browser/storage_partition.h"
|
#include "content/public/browser/storage_partition.h"
|
||||||
#include "url_request_context_getter.h"
|
|
||||||
|
|
||||||
#if defined(OS_LINUX)
|
#if defined(OS_LINUX)
|
||||||
#include "base/nix/xdg_util.h"
|
#include "base/nix/xdg_util.h"
|
||||||
|
@ -28,14 +28,14 @@
|
||||||
namespace brightray {
|
namespace brightray {
|
||||||
|
|
||||||
class BrowserContext::ResourceContext : public content::ResourceContext {
|
class BrowserContext::ResourceContext : public content::ResourceContext {
|
||||||
public:
|
public:
|
||||||
ResourceContext() : getter_(nullptr) {}
|
ResourceContext() : getter_(nullptr) {}
|
||||||
|
|
||||||
void set_url_request_context_getter(URLRequestContextGetter* getter) {
|
void set_url_request_context_getter(URLRequestContextGetter* getter) {
|
||||||
getter_ = getter;
|
getter_ = getter;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual net::HostResolver* GetHostResolver() OVERRIDE {
|
virtual net::HostResolver* GetHostResolver() OVERRIDE {
|
||||||
return getter_->host_resolver();
|
return getter_->host_resolver();
|
||||||
}
|
}
|
||||||
|
@ -44,12 +44,14 @@ private:
|
||||||
return getter_->GetURLRequestContext();
|
return getter_->GetURLRequestContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: We should probably allow clients to override this to implement more restrictive policies.
|
// FIXME: We should probably allow clients to override this to implement more
|
||||||
|
// restrictive policies.
|
||||||
virtual bool AllowMicAccess(const GURL& origin) OVERRIDE {
|
virtual bool AllowMicAccess(const GURL& origin) OVERRIDE {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: We should probably allow clients to override this to implement more restrictive policies.
|
// FIXME: We should probably allow clients to override this to implement more
|
||||||
|
// restrictive policies.
|
||||||
virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE {
|
virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +78,8 @@ void BrowserContext::Initialize() {
|
||||||
auto prefs_path = GetPath().Append(FILE_PATH_LITERAL("Preferences"));
|
auto prefs_path = GetPath().Append(FILE_PATH_LITERAL("Preferences"));
|
||||||
PrefServiceBuilder builder;
|
PrefServiceBuilder builder;
|
||||||
builder.WithUserFilePrefs(prefs_path,
|
builder.WithUserFilePrefs(prefs_path,
|
||||||
JsonPrefStore::GetTaskRunnerForFile(prefs_path, content::BrowserThread::GetBlockingPool()));
|
JsonPrefStore::GetTaskRunnerForFile(
|
||||||
|
prefs_path, content::BrowserThread::GetBlockingPool()));
|
||||||
|
|
||||||
auto registry = make_scoped_refptr(new PrefRegistrySimple);
|
auto registry = make_scoped_refptr(new PrefRegistrySimple);
|
||||||
RegisterInternalPrefs(registry);
|
RegisterInternalPrefs(registry);
|
||||||
|
@ -92,12 +95,17 @@ void BrowserContext::RegisterInternalPrefs(PrefRegistrySimple* registry) {
|
||||||
InspectableWebContentsImpl::RegisterPrefs(registry);
|
InspectableWebContentsImpl::RegisterPrefs(registry);
|
||||||
}
|
}
|
||||||
|
|
||||||
net::URLRequestContextGetter* BrowserContext::CreateRequestContext(content::ProtocolHandlerMap* protocol_handlers) {
|
net::URLRequestContextGetter* BrowserContext::CreateRequestContext(
|
||||||
|
content::ProtocolHandlerMap* protocol_handlers) {
|
||||||
DCHECK(!url_request_getter_);
|
DCHECK(!url_request_getter_);
|
||||||
|
auto io_loop = content::BrowserThread::UnsafeGetMessageLoopForThread(
|
||||||
|
content::BrowserThread::IO),
|
||||||
|
auto file_loop = content::BrowserThread::UnsafeGetMessageLoopForThread(
|
||||||
|
content::BrowserThread::FILE),
|
||||||
url_request_getter_ = new URLRequestContextGetter(
|
url_request_getter_ = new URLRequestContextGetter(
|
||||||
GetPath(),
|
GetPath(),
|
||||||
content::BrowserThread::UnsafeGetMessageLoopForThread(content::BrowserThread::IO),
|
io_loop,
|
||||||
content::BrowserThread::UnsafeGetMessageLoopForThread(content::BrowserThread::FILE),
|
file_loop,
|
||||||
CreateNetworkDelegate().Pass(),
|
CreateNetworkDelegate().Pass(),
|
||||||
protocol_handlers);
|
protocol_handlers);
|
||||||
resource_context_->set_url_request_context_getter(url_request_getter_.get());
|
resource_context_->set_url_request_context_getter(url_request_getter_.get());
|
||||||
|
@ -120,7 +128,8 @@ net::URLRequestContextGetter* BrowserContext::GetRequestContext() {
|
||||||
return GetDefaultStoragePartition(this)->GetURLRequestContext();
|
return GetDefaultStoragePartition(this)->GetURLRequestContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
net::URLRequestContextGetter* BrowserContext::GetRequestContextForRenderProcess(int renderer_child_id) {
|
net::URLRequestContextGetter* BrowserContext::GetRequestContextForRenderProcess(
|
||||||
|
int renderer_child_id) {
|
||||||
return GetRequestContext();
|
return GetRequestContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -128,15 +137,24 @@ net::URLRequestContextGetter* BrowserContext::GetMediaRequestContext() {
|
||||||
return GetRequestContext();
|
return GetRequestContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
net::URLRequestContextGetter* BrowserContext::GetMediaRequestContextForRenderProcess(int renderer_child_id) {
|
net::URLRequestContextGetter*
|
||||||
|
BrowserContext::GetMediaRequestContextForRenderProcess(
|
||||||
|
int renderer_child_id) {
|
||||||
return GetRequestContext();
|
return GetRequestContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
net::URLRequestContextGetter* BrowserContext::GetMediaRequestContextForStoragePartition(const base::FilePath& partition_path, bool in_memory) {
|
net::URLRequestContextGetter*
|
||||||
|
BrowserContext::GetMediaRequestContextForStoragePartition(
|
||||||
|
const base::FilePath& partition_path,
|
||||||
|
bool in_memory) {
|
||||||
return GetRequestContext();
|
return GetRequestContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserContext::RequestMIDISysExPermission(int render_process_id, int render_view_id, const GURL& requesting_frame, const MIDISysExPermissionCallback& callback) {
|
void BrowserContext::RequestMIDISysExPermission(
|
||||||
|
int render_process_id,
|
||||||
|
int render_view_id,
|
||||||
|
const GURL& requesting_frame,
|
||||||
|
const MIDISysExPermissionCallback& callback) {
|
||||||
callback.Run(false);
|
callback.Run(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -150,7 +168,8 @@ content::DownloadManagerDelegate* BrowserContext::GetDownloadManagerDelegate() {
|
||||||
return download_manager_delegate_.get();
|
return download_manager_delegate_.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
content::GeolocationPermissionContext* BrowserContext::GetGeolocationPermissionContext() {
|
content::GeolocationPermissionContext*
|
||||||
|
BrowserContext::GetGeolocationPermissionContext() {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,4 +177,4 @@ quota::SpecialStoragePolicy* BrowserContext::GetSpecialStoragePolicy() {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} // namespace brightray
|
||||||
|
|
Loading…
Reference in a new issue