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

Fix more code styles.

Browse source
This commit is contained in:
Haojian Wu 2015-06-20 10:41:40 +08:00
parent c164da5a38
commit bafbee805c
5 changed files with 39 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
atom/browser/api/atom_api_cookies.cc
View file

@ -10,7 +10,6 @@
#include "base/time/time.h" #include "base/time/time.h"
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
#include "native_mate/callback.h" #include "native_mate/callback.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h" #include "native_mate/object_template_builder.h"
@ -22,11 +21,13 @@
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
using atom::api::Cookies;
using content::BrowserThread; using content::BrowserThread;
namespace { namespace {
bool GetCookieListFromStore(net::CookieStore* cookie_store, bool GetCookieListFromStore(
net::CookieStore* cookie_store,
const std::string& url, const std::string& url,
const net::CookieMonster::GetCookieListCallback& callback) { const net::CookieMonster::GetCookieListCallback& callback) {
DCHECK(cookie_store); DCHECK(cookie_store);
@ -47,7 +48,7 @@ bool GetCookieListFromStore(net::CookieStore* cookie_store,
void RunGetCookiesCallbackOnUIThread(const std::string& error_message, void RunGetCookiesCallbackOnUIThread(const std::string& error_message,
const net::CookieList& cookie_list, const net::CookieList& cookie_list,
const atom::api::Cookies::CookiesCallback& callback) { const Cookies::CookiesCallback& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
v8::Isolate* isolate = v8::Isolate::GetCurrent(); v8::Isolate* isolate = v8::Isolate::GetCurrent();
@ -63,8 +64,9 @@ void RunGetCookiesCallbackOnUIThread(const std::string& error_message,
callback.Run(v8::Null(isolate), mate::ConvertToV8(isolate, cookie_list)); callback.Run(v8::Null(isolate), mate::ConvertToV8(isolate, cookie_list));
} }
void RunRemoveCookiesCallbackOnUIThread(const std::string& error_message, void RunRemoveCookiesCallbackOnUIThread(
const atom::api::Cookies::CookiesCallback& callback) { const std::string& error_message,
const Cookies::CookiesCallback& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
v8::Isolate* isolate = v8::Isolate::GetCurrent(); v8::Isolate* isolate = v8::Isolate::GetCurrent();
@ -82,7 +84,8 @@ void RunRemoveCookiesCallbackOnUIThread(const std::string& error_message,
} }
void RunSetCookiesCallbackOnUIThread(const std::string& error_message, void RunSetCookiesCallbackOnUIThread(const std::string& error_message,
bool set_success, const atom::api::Cookies::CookiesCallback& callback) { bool set_success,
const Cookies::CookiesCallback& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
v8::Isolate* isolate = v8::Isolate::GetCurrent(); v8::Isolate* isolate = v8::Isolate::GetCurrent();
@ -179,8 +182,8 @@ namespace atom {
namespace api { namespace api {
Cookies::Cookies(content::WebContents* web_contents): Cookies::Cookies(content::BrowserContext* browser_context) :
web_contents_(web_contents) { browser_context_(browser_context) {
} }
Cookies::~Cookies() { Cookies::~Cookies() {
@ -198,8 +201,7 @@ void Cookies::Get(const base::DictionaryValue& options,
void Cookies::GetCookiesOnIOThread(scoped_ptr<base::DictionaryValue> filter, void Cookies::GetCookiesOnIOThread(scoped_ptr<base::DictionaryValue> filter,
const CookiesCallback& callback) { const CookiesCallback& callback) {
net::CookieStore* cookie_store = net::CookieStore* cookie_store = browser_context_->GetRequestContext()
web_contents_->GetBrowserContext()->GetRequestContext()
->GetURLRequestContext()->cookie_store(); ->GetURLRequestContext()->cookie_store();
std::string url; std::string url;
filter->GetString("url", &url); filter->GetString("url", &url);
@ -246,8 +248,7 @@ void Cookies::Remove(const mate::Dictionary& details,
void Cookies::RemoveCookiesOnIOThread(const GURL& url, const std::string& name, void Cookies::RemoveCookiesOnIOThread(const GURL& url, const std::string& name,
const CookiesCallback& callback) { const CookiesCallback& callback) {
net::CookieStore* cookie_store = net::CookieStore* cookie_store = browser_context_->GetRequestContext()
web_contents_->GetBrowserContext()->GetRequestContext()
->GetURLRequestContext()->cookie_store(); ->GetURLRequestContext()->cookie_store();
cookie_store->DeleteCookieAsync(url, name, cookie_store->DeleteCookieAsync(url, name,
base::Bind(&Cookies::OnRemoveCookies, base::Unretained(this), callback)); base::Bind(&Cookies::OnRemoveCookies, base::Unretained(this), callback));
@ -288,8 +289,7 @@ void Cookies::SetCookiesOnIOThread(scoped_ptr<base::DictionaryValue> details,
const GURL& url, const GURL& url,
const CookiesCallback& callback) { const CookiesCallback& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_CURRENTLY_ON(BrowserThread::IO);
net::CookieStore* cookie_store = net::CookieStore* cookie_store = browser_context_->GetRequestContext()
web_contents_->GetBrowserContext()->GetRequestContext()
->GetURLRequestContext()->cookie_store(); ->GetURLRequestContext()->cookie_store();
std::string name, value, domain, path; std::string name, value, domain, path;
@ -340,9 +340,10 @@ mate::ObjectTemplateBuilder Cookies::GetObjectTemplateBuilder(
} }
// static // static
mate::Handle<Cookies> Cookies::Create(v8::Isolate* isolate, mate::Handle<Cookies> Cookies::Create(
content::WebContents* web_contents) { v8::Isolate* isolate,
return CreateHandle(isolate, new Cookies(web_contents)); content::BrowserContext* browser_context) {
return CreateHandle(isolate, new Cookies(browser_context));
} }
} // namespace api } // namespace api

8
atom/browser/api/atom_api_cookies.h
View file

@ -16,7 +16,7 @@
#include "net/cookies/canonical_cookie.h" #include "net/cookies/canonical_cookie.h"
namespace content { namespace content {
class WebContents; class BrowserContext;
} }
namespace atom { namespace atom {
@ -30,10 +30,10 @@ class Cookies : public mate::Wrappable {
CookiesCallback; CookiesCallback;
static mate::Handle<Cookies> Create(v8::Isolate* isolate, static mate::Handle<Cookies> Create(v8::Isolate* isolate,
content::WebContents* web_contents); content::BrowserContext* browser_context);
protected: protected:
explicit Cookies(content::WebContents* web_contents); explicit Cookies(content::BrowserContext* browser_context);
~Cookies(); ~Cookies();
void Get(const base::DictionaryValue& options, void Get(const base::DictionaryValue& options,
@ -66,7 +66,7 @@ class Cookies : public mate::Wrappable {
v8::Isolate* isolate) override; v8::Isolate* isolate) override;
private: private:
content::WebContents* web_contents_; content::BrowserContext* browser_context_;
DISALLOW_COPY_AND_ASSIGN(Cookies); DISALLOW_COPY_AND_ASSIGN(Cookies);
}; };

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

@ -5,7 +5,7 @@
#include "atom/browser/api/atom_api_session.h" #include "atom/browser/api/atom_api_session.h"
#include "atom/browser/api/atom_api_cookies.h" #include "atom/browser/api/atom_api_cookies.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/browser_context.h"
#include "native_mate/callback.h" #include "native_mate/callback.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h" #include "native_mate/object_template_builder.h"
@ -16,8 +16,8 @@ namespace atom {
namespace api { namespace api {
Session::Session(content::WebContents* web_contents): Session::Session(content::BrowserContext* browser_context):
web_contents_(web_contents) { browser_context_(browser_context) {
} }
Session::~Session() { Session::~Session() {
@ -25,7 +25,7 @@ Session::~Session() {
v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) { v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {
if (cookies_.IsEmpty()) { if (cookies_.IsEmpty()) {
auto handle = atom::api::Cookies::Create(isolate, web_contents_); auto handle = atom::api::Cookies::Create(isolate, browser_context_);
cookies_.Reset(isolate, handle.ToV8()); cookies_.Reset(isolate, handle.ToV8());
} }
return v8::Local<v8::Value>::New(isolate, cookies_); return v8::Local<v8::Value>::New(isolate, cookies_);
@ -38,9 +38,10 @@ mate::ObjectTemplateBuilder Session::GetObjectTemplateBuilder(
} }
// static // static
mate::Handle<Session> Session::Create(v8::Isolate* isolate, mate::Handle<Session> Session::Create(
content::WebContents* web_contents) { v8::Isolate* isolate,
return CreateHandle(isolate, new Session(web_contents)); content::BrowserContext* browser_context) {
return CreateHandle(isolate, new Session(browser_context));
} }
} // namespace api } // namespace api

8
atom/browser/api/atom_api_session.h
View file

@ -9,7 +9,7 @@
#include "native_mate/wrappable.h" #include "native_mate/wrappable.h"
namespace content { namespace content {
class WebContents; class BrowserContext;
} }
namespace atom { namespace atom {
@ -19,10 +19,10 @@ namespace api {
class Session: public mate::Wrappable { class Session: public mate::Wrappable {
public: public:
static mate::Handle<Session> Create(v8::Isolate* isolate, static mate::Handle<Session> Create(v8::Isolate* isolate,
content::WebContents* web_contents); content::BrowserContext* browser_context);
protected: protected:
explicit Session(content::WebContents* web_contents); explicit Session(content::BrowserContext* browser_context);
~Session(); ~Session();
// mate::Wrappable implementations: // mate::Wrappable implementations:
@ -35,7 +35,7 @@ class Session: public mate::Wrappable {
v8::Global<v8::Value> cookies_; v8::Global<v8::Value> cookies_;
// The webContents which owns the Sesssion. // The webContents which owns the Sesssion.
content::WebContents* web_contents_; content::BrowserContext* browser_context_;
DISALLOW_COPY_AND_ASSIGN(Session); DISALLOW_COPY_AND_ASSIGN(Session);
}; };

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

@ -587,7 +587,7 @@ void WebContents::InspectServiceWorker() {
v8::Local<v8::Value> WebContents::Session(v8::Isolate* isolate) { v8::Local<v8::Value> WebContents::Session(v8::Isolate* isolate) {
if (session_.IsEmpty()) { if (session_.IsEmpty()) {
auto handle = Session::Create(isolate, web_contents()); auto handle = Session::Create(isolate, web_contents()->GetBrowserContext());
session_.Reset(isolate, handle.ToV8()); session_.Reset(isolate, handle.ToV8());
} }
return v8::Local<v8::Value>::New(isolate, session_); return v8::Local<v8::Value>::New(isolate, session_);