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

Move BrowserProcess to BrowserMainParts

Browse source
This commit is contained in:
Cheng Zhao 2015-06-18 16:33:12 +08:00
parent 0120be5b8c
commit e6341ceaaa
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/atom_browser_context.cc
View file

@ -13,7 +13,6 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/threading/sequenced_worker_pool.h" #include "base/threading/sequenced_worker_pool.h"
#include "base/threading/worker_pool.h" #include "base/threading/worker_pool.h"
#include "chrome/browser/browser_process.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/common/url_constants.h" #include "content/public/common/url_constants.h"
#include "net/ftp/ftp_network_layer.h" #include "net/ftp/ftp_network_layer.h"
@ -40,8 +39,7 @@ class NoCacheBackend : public net::HttpCache::BackendFactory {
} // namespace } // namespace
AtomBrowserContext::AtomBrowserContext() AtomBrowserContext::AtomBrowserContext()
: fake_browser_process_(new BrowserProcess), : job_factory_(new AtomURLRequestJobFactory) {
job_factory_(new AtomURLRequestJobFactory) {
} }
AtomBrowserContext::~AtomBrowserContext() { AtomBrowserContext::~AtomBrowserContext() {

4
atom/browser/atom_browser_context.h
View file

@ -7,8 +7,6 @@
#include "brightray/browser/browser_context.h" #include "brightray/browser/browser_context.h"
class BrowserProcess;
namespace atom { namespace atom {
class AtomURLRequestJobFactory; class AtomURLRequestJobFactory;
@ -35,8 +33,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
AtomURLRequestJobFactory* job_factory() const { return job_factory_; } AtomURLRequestJobFactory* job_factory() const { return job_factory_; }
private: private:
// A fake BrowserProcess object that used to feed the source code from chrome.
scoped_ptr<BrowserProcess> fake_browser_process_;
scoped_ptr<WebViewManager> guest_manager_; scoped_ptr<WebViewManager> guest_manager_;
AtomURLRequestJobFactory* job_factory_; // Weak reference. AtomURLRequestJobFactory* job_factory_; // Weak reference.

4
atom/browser/atom_browser_main_parts.cc
View file

@ -11,6 +11,7 @@
#include "atom/common/api/atom_bindings.h" #include "atom/common/api/atom_bindings.h"
#include "atom/common/node_bindings.h" #include "atom/common/node_bindings.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "chrome/browser/browser_process.h"
#include "v8/include/v8-debug.h" #include "v8/include/v8-debug.h"
#if defined(USE_X11) #if defined(USE_X11)
@ -25,7 +26,8 @@ namespace atom {
AtomBrowserMainParts* AtomBrowserMainParts::self_ = NULL; AtomBrowserMainParts* AtomBrowserMainParts::self_ = NULL;
AtomBrowserMainParts::AtomBrowserMainParts() AtomBrowserMainParts::AtomBrowserMainParts()
: browser_(new Browser), : fake_browser_process_(new BrowserProcess),
browser_(new Browser),
node_bindings_(NodeBindings::Create(true)), node_bindings_(NodeBindings::Create(true)),
atom_bindings_(new AtomBindings), atom_bindings_(new AtomBindings),
gc_timer_(true, true) { gc_timer_(true, true) {

5
atom/browser/atom_browser_main_parts.h
View file

@ -8,6 +8,8 @@
#include "base/timer/timer.h" #include "base/timer/timer.h"
#include "brightray/browser/browser_main_parts.h" #include "brightray/browser/browser_main_parts.h"
class BrowserProcess;
namespace atom { namespace atom {
class AtomBindings; class AtomBindings;
@ -41,6 +43,9 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
void SetDPIFromGSettings(); void SetDPIFromGSettings();
#endif #endif
// A fake BrowserProcess object that used to feed the source code from chrome.
scoped_ptr<BrowserProcess> fake_browser_process_;
scoped_ptr<Browser> browser_; scoped_ptr<Browser> browser_;
scoped_ptr<JavascriptEnvironment> js_env_; scoped_ptr<JavascriptEnvironment> js_env_;
scoped_ptr<NodeBindings> node_bindings_; scoped_ptr<NodeBindings> node_bindings_;