diff --git a/atom.gyp b/atom.gyp index d965a79c6681..e41d724908d0 100644 --- a/atom.gyp +++ b/atom.gyp @@ -12,7 +12,6 @@ 'browser/atom_browser_client.h', 'browser/atom_browser_main_parts.cc', 'browser/atom_browser_main_parts.h', - 'browser/atom_browser_main_parts_mac.mm', 'browser/atom_event_processing_window.h', 'browser/atom_event_processing_window.mm', 'browser/native_window.cc', diff --git a/browser/atom_browser_main_parts.cc b/browser/atom_browser_main_parts.cc index 63c50768d556..770a89a65861 100644 --- a/browser/atom_browser_main_parts.cc +++ b/browser/atom_browser_main_parts.cc @@ -4,6 +4,13 @@ #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 { AtomBrowserMainParts::AtomBrowserMainParts() { @@ -12,4 +19,23 @@ AtomBrowserMainParts::AtomBrowserMainParts() { AtomBrowserMainParts::~AtomBrowserMainParts() { } +void AtomBrowserMainParts::PreMainMessageLoopRun() { + brightray::BrowserMainParts::PreMainMessageLoopRun(); + + scoped_ptr 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 diff --git a/browser/atom_browser_main_parts_mac.mm b/browser/atom_browser_main_parts_mac.mm deleted file mode 100644 index ae331803ecb3..000000000000 --- a/browser/atom_browser_main_parts_mac.mm +++ /dev/null @@ -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 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