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

Fix cpplint warnings

Browse source
This commit is contained in:
Cheng Zhao 2016-07-04 19:19:20 +09:00
parent 6c2825c0c4
commit d0719e9b4b
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/api/atom_api_session.cc
View file

@ -354,7 +354,7 @@ template<Session::CacheAction action>
void Session::DoCacheAction(const net::CompletionCallback& callback) { void Session::DoCacheAction(const net::CompletionCallback& callback) {
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(&DoCacheActionInIO, base::Bind(&DoCacheActionInIO,
make_scoped_refptr(browser_context_->url_request_context_getter()), make_scoped_refptr(browser_context_->GetRequestContext()),
action, action,
callback)); callback));
} }
@ -385,7 +385,7 @@ void Session::FlushStorageData() {
void Session::SetProxy(const net::ProxyConfig& config, void Session::SetProxy(const net::ProxyConfig& config,
const base::Closure& callback) { const base::Closure& callback) {
auto getter = browser_context_->url_request_context_getter(); auto getter = browser_context_->GetRequestContext();
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(&SetProxyInIO, base::Unretained(getter), config, callback)); base::Bind(&SetProxyInIO, base::Unretained(getter), config, callback));
} }
@ -455,14 +455,14 @@ void Session::ClearHostResolverCache(mate::Arguments* args) {
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(&ClearHostResolverCacheInIO, base::Bind(&ClearHostResolverCacheInIO,
make_scoped_refptr(browser_context_->url_request_context_getter()), make_scoped_refptr(browser_context_->GetRequestContext()),
callback)); callback));
} }
void Session::AllowNTLMCredentialsForDomains(const std::string& domains) { void Session::AllowNTLMCredentialsForDomains(const std::string& domains) {
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(&AllowNTLMCredentialsForDomainsInIO, base::Bind(&AllowNTLMCredentialsForDomainsInIO,
make_scoped_refptr(browser_context_->url_request_context_getter()), make_scoped_refptr(browser_context_->GetRequestContext()),
domains)); domains));
} }
@ -473,7 +473,7 @@ void Session::SetUserAgent(const std::string& user_agent,
std::string accept_lang = l10n_util::GetApplicationLocale(""); std::string accept_lang = l10n_util::GetApplicationLocale("");
args->GetNext(&accept_lang); args->GetNext(&accept_lang);
auto getter = browser_context_->url_request_context_getter(); auto getter = browser_context_->GetRequestContext();
getter->GetNetworkTaskRunner()->PostTask( getter->GetNetworkTaskRunner()->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&SetUserAgentInIO, getter, accept_lang, user_agent)); base::Bind(&SetUserAgentInIO, getter, accept_lang, user_agent));

6
atom/common/native_mate_converters/gfx_converter.cc
View file

@ -36,7 +36,7 @@ bool Converter<gfx::Point>::FromV8(v8::Isolate* isolate,
} }
v8::Local<v8::Value> Converter<gfx::Size>::ToV8(v8::Isolate* isolate, v8::Local<v8::Value> Converter<gfx::Size>::ToV8(v8::Isolate* isolate,
const gfx::Size& val) { const gfx::Size& val) {
mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate); mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true); dict.SetHidden("simple", true);
dict.Set("width", val.width()); dict.Set("width", val.width());
@ -97,8 +97,8 @@ struct Converter<display::Display::TouchSupport> {
} }
}; };
v8::Local<v8::Value> Converter<display::Display>::ToV8(v8::Isolate* isolate, v8::Local<v8::Value> Converter<display::Display>::ToV8(
const display::Display& val) { v8::Isolate* isolate, const display::Display& val) {
mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate); mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true); dict.SetHidden("simple", true);
dict.Set("id", val.id()); dict.Set("id", val.id());