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

Get rid of default BrowserContext

Browse source
This commit is contained in:
Cheng Zhao 2016-06-22 15:40:52 +09:00
parent 2fb73a266a
commit babd741786
4 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brightray/browser/browser_client.cc
View file

@ -38,10 +38,6 @@ BrowserClient::BrowserClient()
BrowserClient::~BrowserClient() { BrowserClient::~BrowserClient() {
} }
BrowserContext* BrowserClient::browser_context() {
return browser_main_parts_->browser_context();
}
NotificationPresenter* BrowserClient::GetNotificationPresenter() { NotificationPresenter* BrowserClient::GetNotificationPresenter() {
#if defined(OS_WIN) #if defined(OS_WIN)
// Bail out if on Windows 7 or even lower, no operating will follow // Bail out if on Windows 7 or even lower, no operating will follow

1
brightray/browser/browser_client.h
View file

@ -23,7 +23,6 @@ class BrowserClient : public content::ContentBrowserClient {
BrowserClient(); BrowserClient();
~BrowserClient(); ~BrowserClient();
BrowserContext* browser_context();
BrowserMainParts* browser_main_parts() { return browser_main_parts_; } BrowserMainParts* browser_main_parts() { return browser_main_parts_; }
NotificationPresenter* GetNotificationPresenter(); NotificationPresenter* GetNotificationPresenter();

4
brightray/browser/browser_main_parts.cc
View file

@ -206,8 +206,6 @@ void BrowserMainParts::PreMainMessageLoopStart() {
} }
void BrowserMainParts::PreMainMessageLoopRun() { void BrowserMainParts::PreMainMessageLoopRun() {
browser_context_ = BrowserContext::From("", false);
content::WebUIControllerFactory::RegisterFactory( content::WebUIControllerFactory::RegisterFactory(
WebUIControllerFactory::GetInstance()); WebUIControllerFactory::GetInstance());
@ -230,8 +228,6 @@ void BrowserMainParts::PostMainMessageLoopStart() {
} }
void BrowserMainParts::PostMainMessageLoopRun() { void BrowserMainParts::PostMainMessageLoopRun() {
browser_context_ = nullptr;
#if defined(USE_X11) #if defined(USE_X11)
// Unset the X11 error handlers. The X11 error handlers log the errors using a // Unset the X11 error handlers. The X11 error handlers log the errors using a
// |PostTask()| on the message-loop. But since the message-loop is in the // |PostTask()| on the message-loop. But since the message-loop is in the

5
brightray/browser/browser_main_parts.h
View file

@ -27,15 +27,11 @@ class WMState;
namespace brightray { namespace brightray {
class BrowserContext;
class BrowserMainParts : public content::BrowserMainParts { class BrowserMainParts : public content::BrowserMainParts {
public: public:
BrowserMainParts(); BrowserMainParts();
~BrowserMainParts(); ~BrowserMainParts();
BrowserContext* browser_context() { return browser_context_.get(); }
protected: protected:
// content::BrowserMainParts: // content::BrowserMainParts:
void PreEarlyInitialization() override; void PreEarlyInitialization() override;
@ -52,7 +48,6 @@ class BrowserMainParts : public content::BrowserMainParts {
void InitializeMainNib(); void InitializeMainNib();
#endif #endif
scoped_refptr<BrowserContext> browser_context_;
std::unique_ptr<devtools_http_handler::DevToolsHttpHandler> devtools_http_handler_; std::unique_ptr<devtools_http_handler::DevToolsHttpHandler> devtools_http_handler_;
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)