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

AtomBrowserMainParts is platform-independent now.

Browse source
This commit is contained in:
Cheng Zhao 2013-04-12 15:57:17 +08:00
parent af94c434ac
commit f5e74e1b65
3 changed files with 26 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom.gyp
View file

@ -12,7 +12,6 @@
'browser/atom_browser_client.h', 'browser/atom_browser_client.h',
'browser/atom_browser_main_parts.cc', 'browser/atom_browser_main_parts.cc',
'browser/atom_browser_main_parts.h', 'browser/atom_browser_main_parts.h',
'browser/atom_browser_main_parts_mac.mm',
'browser/atom_event_processing_window.h', 'browser/atom_event_processing_window.h',
'browser/atom_event_processing_window.mm', 'browser/atom_event_processing_window.mm',
'browser/native_window.cc', 'browser/native_window.cc',

26
browser/atom_browser_main_parts.cc
View file

@ -4,6 +4,13 @@
#include "browser/atom_browser_main_parts.h" #include "browser/atom_browser_main_parts.h"
#include "base/values.h"
#include "browser/native_window.h"
#include "brightray/browser/browser_context.h"
#include "brightray/browser/default_web_contents_delegate.h"
#include "brightray/browser/inspectable_web_contents.h"
#include "brightray/browser/inspectable_web_contents_view.h"
namespace atom { namespace atom {
AtomBrowserMainParts::AtomBrowserMainParts() { AtomBrowserMainParts::AtomBrowserMainParts() {
@ -12,4 +19,23 @@ AtomBrowserMainParts::AtomBrowserMainParts() {
AtomBrowserMainParts::~AtomBrowserMainParts() { AtomBrowserMainParts::~AtomBrowserMainParts() {
} }
void AtomBrowserMainParts::PreMainMessageLoopRun() {
brightray::BrowserMainParts::PreMainMessageLoopRun();
scoped_ptr<base::DictionaryValue> options(new base::DictionaryValue);
options->SetInteger("width", 800);
options->SetInteger("height", 600);
options->SetString("title", "Atom");
// FIXME: Leak object here.
NativeWindow* window = NativeWindow::Create(browser_context(), options.get());
window->InitFromOptions(options.get());
window->GetWebContents()->GetController().LoadURL(
GURL("http://adam.roben.org/brightray_example/start.html"),
content::Referrer(),
content::PAGE_TRANSITION_AUTO_TOPLEVEL,
std::string());
}
} // namespace atom } // namespace atom

35
browser/atom_browser_main_parts_mac.mm
View file

@ -1,35 +0,0 @@
// Copyright (c) 2013 GitHub, Inc. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "browser/atom_browser_main_parts.h"
#include "base/values.h"
#include "browser/native_window.h"
#include "brightray/browser/browser_context.h"
#include "brightray/browser/default_web_contents_delegate.h"
#include "brightray/browser/inspectable_web_contents.h"
#include "brightray/browser/inspectable_web_contents_view.h"
namespace atom {
void AtomBrowserMainParts::PreMainMessageLoopRun() {
brightray::BrowserMainParts::PreMainMessageLoopRun();
scoped_ptr<base::DictionaryValue> options(new base::DictionaryValue);
options->SetInteger("width", 800);
options->SetInteger("height", 600);
options->SetString("title", "Atom");
// FIXME: Leak object here.
NativeWindow* window = NativeWindow::Create(browser_context(), options.get());
window->InitFromOptions(options.get());
window->GetWebContents()->GetController().LoadURL(
GURL("http://adam.roben.org/brightray_example/start.html"),
content::Referrer(),
content::PAGE_TRANSITION_AUTO_TOPLEVEL,
std::string());
}
} // namespace atom