Bump v0.21.3

Fix tense of error message

.gitignore

@@ -1,10 +1,11 @@
 .DS_Store
 /build/
 /dist/
-/frameworks/
+/external_binaries/
 /out/
 /vendor/brightray/vendor/download/
 /vendor/python_26/
+/vendor/npm/
 node_modules/
 *.xcodeproj
 *.swp

.gitmodules

@@ -1,15 +1,15 @@
 [submodule "vendor/brightray"]
 	path = vendor/brightray
-  url = https://github.com/brightray/brightray.git
+	url = https://github.com/brightray/brightray.git
 [submodule "vendor/node"]
 	path = vendor/node
-  url = https://github.com/atom/node.git
+	url = https://github.com/atom/node.git
 [submodule "vendor/depot_tools"]
 	path = vendor/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
-[submodule "vendor/apm"]
-	path = vendor/apm
-	url = https://github.com/atom/apm.git
 [submodule "vendor/breakpad"]
 	path = vendor/breakpad
 	url = https://github.com/atom/chromium-breakpad.git
+[submodule "vendor/native_mate"]
+	path = vendor/native_mate
+	url = https://github.com/zcbenz/native-mate.git

.travis.yml

@@ -0,0 +1,15 @@
+language: cpp
+compiler: clang
+os:
+  - linux
+  - osx
+
+notifications:
+  email:
+    on_success: never
+    on_failure: change
+
+script: './script/cibuild'
+
+git:
+  depth: 10

LICENSE

@@ -1,28 +1,20 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 2014 GitHub Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,20 +1,36 @@
-# Atom Shell
+# Atom Shell [![Build Status](https://travis-ci.org/atom/atom-shell.svg?branch=master)](https://travis-ci.org/atom/atom-shell)
 
-Native layer for the [Atom editor](https://github.com/atom/atom).
+The Atom Shell framework lets you write cross-platform desktop applications
+using JavaScript, HTML and CSS. It is based on [node.js](http://nodejs.org) and
+[Chromium](http://www.chromium.org) and is used in the [Atom
+editor](https://github.com/atom/atom).
 
-## Features
+## Downloads
 
-* Write desktop applications with web techniques
-* Support built-in and third-party modules of node.js
-* Support native node.js modules
-* Extended built-in modules for desktop programming
-* JavaScript on browser side
-* Easy API for cross-process communication
+Prebuilt binaries of atom-shell for Linux, Windows and Mac can be found on the
+[releases](https://github.com/atom/atom-shell/releases) page.
 
-## Usage & Development
+You can also use [`npm`](https://docs.npmjs.com/) to install prebuilt atom-shell binaries:
 
-See the docs [here](https://github.com/atom/atom-shell/tree/master/docs).
+```
+# Install globally in your $PATH
+npm install atom-shell -g
 
-## License
+# Install as a development dependency
+npm install atom-shell --save-dev
+```
 
-See the [`LICENSE`](LICENSE) file.
+### Mirrors
+
+- [China Mirror](https://npm.taobao.org/mirrors/atom-shell): Improve download speeds for Chinese user.
+
+## Documentation
+
+Guides and the API reference are located in the
+[docs](https://github.com/atom/atom-shell/tree/master/docs) directory. It also
+contains documents describing how to build and contribute to atom-shell.
+
+## Community
+
+There is an [`atom-shell` category on the Atom forums](http://discuss.atom.io/category/atom-shell)
+as well as an `#atom-shell` channel on Freenode.

appveyor.yml

@@ -0,0 +1,28 @@
+# appveyor file
+# http://www.appveyor.com/docs/appveyor-yml
+version: "{build}"
+
+init:
+  - git config --global core.autocrlf input
+
+environment:
+  matrix:
+    - nodejs_version: 0.10
+
+platform:
+  - x86
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - cmd: SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH%
+  - cmd: SET PATH=C:\python27;%PATH%
+  - cmd: python script/bootstrap.py
+  - cmd: python script/build.py -c Debug
+
+test_script:
+  - node --version
+  - npm --version
+  - cmd: python script/cpplint.py
+  - cmd: python script/coffeelint.py
+
+build: off

atom.gyp

@@ -1,8 +1,10 @@
 {
   'variables': {
-    'project_name': 'atom',
-    'product_name': 'Atom',
-    'framework_name': 'Atom Framework',
+    'includes': [
+      'vendor/native_mate/native_mate_files.gypi',
+    ],
+    'project_name%': 'atom',
+    'product_name%': 'Atom',
     'app_sources': [
       'atom/app/atom_main.cc',
       'atom/app/atom_main.h',
@@ -15,12 +17,20 @@
       'atom/browser/api/lib/atom-delegate.coffee',
       'atom/browser/api/lib/auto-updater.coffee',
       'atom/browser/api/lib/browser-window.coffee',
+      'atom/browser/api/lib/content-tracing.coffee',
       'atom/browser/api/lib/dialog.coffee',
+      'atom/browser/api/lib/global-shortcut.coffee',
       'atom/browser/api/lib/ipc.coffee',
       'atom/browser/api/lib/menu.coffee',
       'atom/browser/api/lib/menu-item.coffee',
       'atom/browser/api/lib/power-monitor.coffee',
       'atom/browser/api/lib/protocol.coffee',
+      'atom/browser/api/lib/screen.coffee',
+      'atom/browser/api/lib/tray.coffee',
+      'atom/browser/api/lib/web-contents.coffee',
+      'atom/browser/lib/chrome-extension.coffee',
+      'atom/browser/lib/guest-view-manager.coffee',
+      'atom/browser/lib/guest-window-manager.coffee',
       'atom/browser/lib/init.coffee',
       'atom/browser/lib/objects-registry.coffee',
       'atom/browser/lib/rpc-server.coffee',
@@ -28,15 +38,30 @@
       'atom/common/api/lib/clipboard.coffee',
       'atom/common/api/lib/crash-reporter.coffee',
       'atom/common/api/lib/id-weak-map.coffee',
-      'atom/common/api/lib/screen.coffee',
+      'atom/common/api/lib/native-image.coffee',
+      'atom/common/api/lib/original-fs.coffee',
       'atom/common/api/lib/shell.coffee',
       'atom/common/lib/init.coffee',
+      'atom/renderer/lib/chrome-api.coffee',
       'atom/renderer/lib/init.coffee',
+      'atom/renderer/lib/inspector.coffee',
       'atom/renderer/lib/override.coffee',
+      'atom/renderer/lib/web-view/guest-view-internal.coffee',
+      'atom/renderer/lib/web-view/web-view.coffee',
+      'atom/renderer/lib/web-view/web-view-attributes.coffee',
+      'atom/renderer/lib/web-view/web-view-constants.coffee',
       'atom/renderer/api/lib/ipc.coffee',
       'atom/renderer/api/lib/remote.coffee',
+      'atom/renderer/api/lib/screen.coffee',
+      'atom/renderer/api/lib/web-frame.coffee',
+    ],
+    'coffee2c_sources': [
+      'atom/common/lib/asar.coffee',
+      'atom/common/lib/asar_init.coffee',
     ],
     'lib_sources': [
+      'atom/app/atom_content_client.cc',
+      'atom/app/atom_content_client.h',
       'atom/app/atom_main_delegate.cc',
       'atom/app/atom_main_delegate.h',
       'atom/app/atom_main_delegate_mac.mm',
@@ -44,77 +69,88 @@
       'atom/browser/api/atom_api_app.h',
       'atom/browser/api/atom_api_auto_updater.cc',
       'atom/browser/api/atom_api_auto_updater.h',
-      'atom/browser/api/atom_api_browser_ipc.cc',
-      'atom/browser/api/atom_api_browser_ipc.h',
+      'atom/browser/api/atom_api_content_tracing.cc',
       'atom/browser/api/atom_api_dialog.cc',
-      'atom/browser/api/atom_api_dialog.h',
-      'atom/browser/api/atom_api_event.cc',
-      'atom/browser/api/atom_api_event.h',
+      'atom/browser/api/atom_api_global_shortcut.cc',
+      'atom/browser/api/atom_api_global_shortcut.h',
       'atom/browser/api/atom_api_menu.cc',
       'atom/browser/api/atom_api_menu.h',
-      'atom/browser/api/atom_api_menu_gtk.cc',
-      'atom/browser/api/atom_api_menu_gtk.h',
+      'atom/browser/api/atom_api_menu_views.cc',
+      'atom/browser/api/atom_api_menu_views.h',
       'atom/browser/api/atom_api_menu_mac.h',
       'atom/browser/api/atom_api_menu_mac.mm',
-      'atom/browser/api/atom_api_menu_win.cc',
-      'atom/browser/api/atom_api_menu_win.h',
       'atom/browser/api/atom_api_power_monitor.cc',
       'atom/browser/api/atom_api_power_monitor.h',
       'atom/browser/api/atom_api_protocol.cc',
       'atom/browser/api/atom_api_protocol.h',
+      'atom/browser/api/atom_api_screen.cc',
+      'atom/browser/api/atom_api_screen.h',
+      'atom/browser/api/atom_api_tray.cc',
+      'atom/browser/api/atom_api_tray.h',
+      'atom/browser/api/atom_api_web_contents.cc',
+      'atom/browser/api/atom_api_web_contents.h',
+      'atom/browser/api/atom_api_web_view_manager.cc',
       'atom/browser/api/atom_api_window.cc',
       'atom/browser/api/atom_api_window.h',
-      'atom/browser/api/atom_browser_bindings.cc',
-      'atom/browser/api/atom_browser_bindings.h',
+      'atom/browser/api/event.cc',
+      'atom/browser/api/event.h',
+      'atom/browser/api/event_emitter.cc',
+      'atom/browser/api/event_emitter.h',
       'atom/browser/auto_updater.cc',
       'atom/browser/auto_updater.h',
       'atom/browser/auto_updater_delegate.h',
       'atom/browser/auto_updater_linux.cc',
       'atom/browser/auto_updater_mac.mm',
       'atom/browser/auto_updater_win.cc',
-      'atom/browser/atom_application_mac.h',
-      'atom/browser/atom_application_mac.mm',
-      'atom/browser/atom_application_delegate_mac.h',
-      'atom/browser/atom_application_delegate_mac.mm',
+      'atom/browser/atom_access_token_store.cc',
+      'atom/browser/atom_access_token_store.h',
       'atom/browser/atom_browser_client.cc',
       'atom/browser/atom_browser_client.h',
       'atom/browser/atom_browser_context.cc',
       'atom/browser/atom_browser_context.h',
       'atom/browser/atom_browser_main_parts.cc',
       'atom/browser/atom_browser_main_parts.h',
+      'atom/browser/atom_browser_main_parts_linux.cc',
       'atom/browser/atom_browser_main_parts_mac.mm',
       'atom/browser/atom_javascript_dialog_manager.cc',
       'atom/browser/atom_javascript_dialog_manager.h',
+      'atom/browser/atom_speech_recognition_manager_delegate.cc',
+      'atom/browser/atom_speech_recognition_manager_delegate.h',
       'atom/browser/browser.cc',
       'atom/browser/browser.h',
       'atom/browser/browser_linux.cc',
       'atom/browser/browser_mac.mm',
       'atom/browser/browser_win.cc',
       'atom/browser/browser_observer.h',
-      'atom/browser/devtools_delegate.cc',
-      'atom/browser/devtools_delegate.h',
+      'atom/browser/javascript_environment.cc',
+      'atom/browser/javascript_environment.h',
+      'atom/browser/mac/atom_application.h',
+      'atom/browser/mac/atom_application.mm',
+      'atom/browser/mac/atom_application_delegate.h',
+      'atom/browser/mac/atom_application_delegate.mm',
       'atom/browser/native_window.cc',
       'atom/browser/native_window.h',
-      'atom/browser/native_window_gtk.cc',
-      'atom/browser/native_window_gtk.h',
+      'atom/browser/native_window_views.cc',
+      'atom/browser/native_window_views.h',
       'atom/browser/native_window_mac.h',
       'atom/browser/native_window_mac.mm',
-      'atom/browser/native_window_win.cc',
-      'atom/browser/native_window_win.h',
       'atom/browser/native_window_observer.h',
       'atom/browser/net/adapter_request_job.cc',
       'atom/browser/net/adapter_request_job.h',
-      'atom/browser/net/atom_url_request_context_getter.cc',
-      'atom/browser/net/atom_url_request_context_getter.h',
+      'atom/browser/net/asar/asar_protocol_handler.cc',
+      'atom/browser/net/asar/asar_protocol_handler.h',
+      'atom/browser/net/asar/url_request_asar_job.cc',
+      'atom/browser/net/asar/url_request_asar_job.h',
       'atom/browser/net/atom_url_request_job_factory.cc',
       'atom/browser/net/atom_url_request_job_factory.h',
       'atom/browser/net/url_request_string_job.cc',
       'atom/browser/net/url_request_string_job.h',
+      'atom/browser/node_debugger.cc',
+      'atom/browser/node_debugger.h',
       'atom/browser/ui/accelerator_util.cc',
       'atom/browser/ui/accelerator_util.h',
-      'atom/browser/ui/accelerator_util_gtk.cc',
       'atom/browser/ui/accelerator_util_mac.mm',
-      'atom/browser/ui/accelerator_util_win.cc',
+      'atom/browser/ui/accelerator_util_views.cc',
       'atom/browser/ui/cocoa/atom_menu_controller.h',
       'atom/browser/ui/cocoa/atom_menu_controller.mm',
       'atom/browser/ui/cocoa/event_processing_window.h',
@@ -124,37 +160,68 @@
       'atom/browser/ui/file_dialog_mac.mm',
       'atom/browser/ui/file_dialog_win.cc',
       'atom/browser/ui/message_box.h',
-      'atom/browser/ui/message_box_gtk.cc',
       'atom/browser/ui/message_box_mac.mm',
-      'atom/browser/ui/message_box_win.cc',
-      'atom/browser/ui/win/menu_2.cc',
-      'atom/browser/ui/win/menu_2.h',
-      'atom/browser/ui/win/native_menu_win.cc',
-      'atom/browser/ui/win/native_menu_win.h',
+      'atom/browser/ui/message_box_views.cc',
+      'atom/browser/ui/tray_icon.cc',
+      'atom/browser/ui/tray_icon.h',
+      'atom/browser/ui/tray_icon_gtk.cc',
+      'atom/browser/ui/tray_icon_gtk.h',
+      'atom/browser/ui/tray_icon_cocoa.h',
+      'atom/browser/ui/tray_icon_cocoa.mm',
+      'atom/browser/ui/tray_icon_observer.h',
+      'atom/browser/ui/tray_icon_win.cc',
+      'atom/browser/ui/views/frameless_view.cc',
+      'atom/browser/ui/views/frameless_view.h',
+      'atom/browser/ui/views/global_menu_bar_x11.cc',
+      'atom/browser/ui/views/global_menu_bar_x11.h',
+      'atom/browser/ui/views/menu_bar.cc',
+      'atom/browser/ui/views/menu_bar.h',
+      'atom/browser/ui/views/menu_delegate.cc',
+      'atom/browser/ui/views/menu_delegate.h',
+      'atom/browser/ui/views/menu_layout.cc',
+      'atom/browser/ui/views/menu_layout.h',
+      'atom/browser/ui/views/submenu_button.cc',
+      'atom/browser/ui/views/submenu_button.h',
+      'atom/browser/ui/views/win_frame_view.cc',
+      'atom/browser/ui/views/win_frame_view.h',
+      'atom/browser/ui/win/notify_icon_host.cc',
+      'atom/browser/ui/win/notify_icon_host.h',
+      'atom/browser/ui/win/notify_icon.cc',
+      'atom/browser/ui/win/notify_icon.h',
+      'atom/browser/ui/x/window_state_watcher.cc',
+      'atom/browser/ui/x/window_state_watcher.h',
+      'atom/browser/ui/x/x_window_utils.cc',
+      'atom/browser/ui/x/x_window_utils.h',
+      'atom/browser/web_view_manager.cc',
+      'atom/browser/web_view_manager.h',
+      'atom/browser/web_dialog_helper.cc',
+      'atom/browser/web_dialog_helper.h',
       'atom/browser/window_list.cc',
       'atom/browser/window_list.h',
       'atom/browser/window_list_observer.h',
-      'atom/common/api/api_messages.cc',
       'atom/common/api/api_messages.h',
+      'atom/common/api/atom_api_asar.cc',
       'atom/common/api/atom_api_clipboard.cc',
-      'atom/common/api/atom_api_clipboard.h',
       'atom/common/api/atom_api_crash_reporter.cc',
-      'atom/common/api/atom_api_crash_reporter.h',
-      'atom/common/api/atom_api_event_emitter.cc',
-      'atom/common/api/atom_api_event_emitter.h',
       'atom/common/api/atom_api_id_weak_map.cc',
       'atom/common/api/atom_api_id_weak_map.h',
-      'atom/common/api/atom_api_screen.cc',
-      'atom/common/api/atom_api_screen.h',
+      'atom/common/api/atom_api_native_image.cc',
+      'atom/common/api/atom_api_native_image.h',
+      'atom/common/api/atom_api_native_image_mac.mm',
       'atom/common/api/atom_api_shell.cc',
-      'atom/common/api/atom_api_shell.h',
       'atom/common/api/atom_api_v8_util.cc',
       'atom/common/api/atom_bindings.cc',
       'atom/common/api/atom_bindings.h',
-      'atom/common/api/atom_extensions.cc',
-      'atom/common/api/atom_extensions.h',
       'atom/common/api/object_life_monitor.cc',
       'atom/common/api/object_life_monitor.h',
+      'atom/common/asar/archive.cc',
+      'atom/common/asar/archive.h',
+      'atom/common/asar/asar_util.cc',
+      'atom/common/asar/asar_util.h',
+      'atom/common/asar/scoped_temporary_file.cc',
+      'atom/common/asar/scoped_temporary_file.h',
+      'atom/common/common_message_generator.cc',
+      'atom/common/common_message_generator.h',
       'atom/common/crash_reporter/crash_reporter.cc',
       'atom/common/crash_reporter/crash_reporter.h',
       'atom/common/crash_reporter/crash_reporter_linux.cc',
@@ -171,7 +238,21 @@
       'atom/common/crash_reporter/win/crash_service_main.h',
       'atom/common/draggable_region.cc',
       'atom/common/draggable_region.h',
+      'atom/common/google_api_key.h',
       'atom/common/linux/application_info.cc',
+      'atom/common/native_mate_converters/accelerator_converter.cc',
+      'atom/common/native_mate_converters/accelerator_converter.h',
+      'atom/common/native_mate_converters/file_path_converter.h',
+      'atom/common/native_mate_converters/gfx_converter.cc',
+      'atom/common/native_mate_converters/gfx_converter.h',
+      'atom/common/native_mate_converters/gurl_converter.h',
+      'atom/common/native_mate_converters/image_converter.cc',
+      'atom/common/native_mate_converters/image_converter.h',
+      'atom/common/native_mate_converters/string16_converter.h',
+      'atom/common/native_mate_converters/v8_value_converter.cc',
+      'atom/common/native_mate_converters/v8_value_converter.h',
+      'atom/common/native_mate_converters/value_converter.cc',
+      'atom/common/native_mate_converters/value_converter.h',
       'atom/common/node_bindings.cc',
       'atom/common/node_bindings.h',
       'atom/common/node_bindings_linux.cc',
@@ -180,43 +261,105 @@
       'atom/common/node_bindings_mac.h',
       'atom/common/node_bindings_win.cc',
       'atom/common/node_bindings_win.h',
+      'atom/common/node_includes.h',
       'atom/common/options_switches.cc',
       'atom/common/options_switches.h',
       'atom/common/platform_util.h',
       'atom/common/platform_util_linux.cc',
       'atom/common/platform_util_mac.mm',
       'atom/common/platform_util_win.cc',
-      'atom/common/swap_or_assign.h',
-      'atom/common/v8/node_common.h',
-      'atom/common/v8/scoped_persistent.h',
-      'atom/common/v8/native_type_conversions.h',
-      'atom/common/v8/v8_value_converter.cc',
-      'atom/common/v8/v8_value_converter.h',
       'atom/renderer/api/atom_api_renderer_ipc.cc',
-      'atom/renderer/api/atom_api_renderer_ipc.h',
-      'atom/renderer/api/atom_renderer_bindings.cc',
-      'atom/renderer/api/atom_renderer_bindings.h',
+      'atom/renderer/api/atom_api_spell_check_client.cc',
+      'atom/renderer/api/atom_api_spell_check_client.h',
+      'atom/renderer/api/atom_api_web_frame.cc',
+      'atom/renderer/api/atom_api_web_frame.h',
       'atom/renderer/atom_render_view_observer.cc',
       'atom/renderer/atom_render_view_observer.h',
       'atom/renderer/atom_renderer_client.cc',
       'atom/renderer/atom_renderer_client.h',
-      'chrome/browser/ui/gtk/event_utils.cc',
-      'chrome/browser/ui/gtk/event_utils.h',
-      'chrome/browser/ui/gtk/gtk_custom_menu.cc',
-      'chrome/browser/ui/gtk/gtk_custom_menu.h',
-      'chrome/browser/ui/gtk/gtk_custom_menu_item.cc',
-      'chrome/browser/ui/gtk/gtk_custom_menu_item.h',
-      'chrome/browser/ui/gtk/gtk_util.cc',
-      'chrome/browser/ui/gtk/gtk_util.h',
-      'chrome/browser/ui/gtk/gtk_window_util.cc',
-      'chrome/browser/ui/gtk/gtk_window_util.h',
-      'chrome/browser/ui/gtk/menu_gtk.cc',
-      'chrome/browser/ui/gtk/menu_gtk.h',
+      'chromium_src/chrome/browser/browser_process.cc',
+      'chromium_src/chrome/browser/browser_process.h',
+      'chromium_src/chrome/browser/chrome_notification_types.h',
+      'chromium_src/chrome/browser/extensions/global_shortcut_listener.cc',
+      'chromium_src/chrome/browser/extensions/global_shortcut_listener.h',
+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.mm',
+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h',
+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc',
+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h',
+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_win.cc',
+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h',
+      'chromium_src/chrome/browser/printing/print_job.cc',
+      'chromium_src/chrome/browser/printing/print_job.h',
+      'chromium_src/chrome/browser/printing/print_job_manager.cc',
+      'chromium_src/chrome/browser/printing/print_job_manager.h',
+      'chromium_src/chrome/browser/printing/print_job_worker.cc',
+      'chromium_src/chrome/browser/printing/print_job_worker.h',
+      'chromium_src/chrome/browser/printing/print_job_worker_owner.cc',
+      'chromium_src/chrome/browser/printing/print_job_worker_owner.h',
+      'chromium_src/chrome/browser/printing/print_view_manager_base.cc',
+      'chromium_src/chrome/browser/printing/print_view_manager_base.h',
+      'chromium_src/chrome/browser/printing/print_view_manager_basic.cc',
+      'chromium_src/chrome/browser/printing/print_view_manager_basic.h',
+      'chromium_src/chrome/browser/printing/print_view_manager_observer.h',
+      'chromium_src/chrome/browser/printing/printer_query.cc',
+      'chromium_src/chrome/browser/printing/printer_query.h',
+      'chromium_src/chrome/browser/printing/printing_message_filter.cc',
+      'chromium_src/chrome/browser/printing/printing_message_filter.h',
+      'chromium_src/chrome/browser/speech/tts_controller.h',
+      'chromium_src/chrome/browser/speech/tts_controller_impl.cc',
+      'chromium_src/chrome/browser/speech/tts_controller_impl.h',
+      'chromium_src/chrome/browser/speech/tts_linux.cc',
+      'chromium_src/chrome/browser/speech/tts_mac.mm',
+      'chromium_src/chrome/browser/speech/tts_message_filter.cc',
+      'chromium_src/chrome/browser/speech/tts_message_filter.h',
+      'chromium_src/chrome/browser/speech/tts_platform.cc',
+      'chromium_src/chrome/browser/speech/tts_platform.h',
+      'chromium_src/chrome/browser/speech/tts_win.cc',
+      'chromium_src/chrome/browser/ui/browser_dialogs.h',
+      'chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm',
+      'chromium_src/chrome/browser/ui/views/color_chooser_aura.cc',
+      'chromium_src/chrome/browser/ui/views/color_chooser_aura.h',
+      'chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc',
+      'chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h',
+      'chromium_src/chrome/common/print_messages.cc',
+      'chromium_src/chrome/common/print_messages.h',
+      'chromium_src/chrome/common/tts_messages.h',
+      'chromium_src/chrome/common/tts_utterance_request.cc',
+      'chromium_src/chrome/common/tts_utterance_request.h',
+      'chromium_src/chrome/renderer/printing/print_web_view_helper.cc',
+      'chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc',
+      'chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm',
+      'chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc',
+      'chromium_src/chrome/renderer/printing/print_web_view_helper.h',
+      'chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc',
+      'chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h',
+      'chromium_src/chrome/renderer/tts_dispatcher.cc',
+      'chromium_src/chrome/renderer/tts_dispatcher.h',
+      'chromium_src/library_loaders/libgio_loader.cc',
+      'chromium_src/library_loaders/libgio.h',
+      'chromium_src/library_loaders/libspeechd_loader.cc',
+      'chromium_src/library_loaders/libspeechd.h',
+      '<@(native_mate_files)',
+      '<(SHARED_INTERMEDIATE_DIR)/atom_natives.h',
+    ],
+    'lib_sources_win': [
+      'chromium_src/chrome/browser/ui/views/color_chooser_dialog.cc',
+      'chromium_src/chrome/browser/ui/views/color_chooser_dialog.h',
+      'chromium_src/chrome/browser/ui/views/color_chooser_win.cc',
     ],
     'framework_sources': [
-      'atom/app/atom_library_main.cc',
       'atom/app/atom_library_main.h',
+      'atom/app/atom_library_main.mm',
     ],
+    'locales': [
+      'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB',
+      'en-US', 'es-419', 'es', 'et', 'fa', 'fi', 'fil', 'fr', 'gu', 'he',
+      'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv',
+      'ml', 'mr', 'ms', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru',
+      'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk',
+      'vi', 'zh-CN', 'zh-TW',
+    ],
+    'atom_source_root': '<!(["python", "tools/atom_source_root.py"])',
     'conditions': [
       ['OS=="win"', {
         'app_sources': [
@@ -226,12 +369,14 @@
           '<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc',
         ],
       }],  # OS=="win"
+      ['OS=="mac"', {
+        'apply_locales_cmd': ['python', 'tools/mac/apply_locales.py'],
+      }],  # OS=="mac"
     ],
-    'atom_source_root': '<!(python tools/atom_source_root.py)',
   },
   'target_defaults': {
     'mac_framework_dirs': [
-      '<(atom_source_root)/frameworks',
+      '<(atom_source_root)/external_binaries',
     ],
     'includes': [
        # Rules for excluding e.g. foo_win.cc from the build on non-Windows.
@@ -249,7 +394,7 @@
       'target_name': '<(project_name)',
       'type': 'executable',
       'dependencies': [
-        'generated_sources',
+        'compile_coffee',
         '<(project_name)_lib',
       ],
       'sources': [
@@ -283,10 +428,10 @@
               'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Frameworks',
               'files': [
                 '<(PRODUCT_DIR)/<(product_name) Helper.app',
-                '<(PRODUCT_DIR)/<(framework_name).framework',
-                'frameworks/Squirrel.framework',
-                'frameworks/ReactiveCocoa.framework',
-                'frameworks/Mantle.framework',
+                '<(PRODUCT_DIR)/<(product_name) Framework.framework',
+                'external_binaries/Squirrel.framework',
+                'external_binaries/ReactiveCocoa.framework',
+                'external_binaries/Mantle.framework',
               ],
             },
             {
@@ -313,8 +458,27 @@
                 '<(product_name)',
               ],
             },
+              # The application doesn't have real localizations, it just has
+              # empty .lproj directories, which is enough to convince Cocoa
+              # atom-shell supports those languages.
+            {
+              'postbuild_name': 'Make Empty Localizations',
+              'variables': {
+                'locale_dirs': [
+                  '>!@(<(apply_locales_cmd) -d ZZLOCALE.lproj <(locales))',
+                ],
+              },
+              'action': [
+                'tools/mac/make_locale_dirs.sh',
+                '<@(locale_dirs)',
+              ],
+            },
           ]
-        }],  # OS=="mac"
+        }, {  # OS=="mac"
+          'dependencies': [
+            'make_locale_paks',
+          ],
+        }],  # OS!="mac"
         ['OS=="win"', {
           'copies': [
             {
@@ -322,9 +486,17 @@
               'files': [
                 '<(libchromiumcontent_library_dir)/chromiumcontent.dll',
                 '<(libchromiumcontent_library_dir)/ffmpegsumo.dll',
-                '<(libchromiumcontent_library_dir)/icudt.dll',
+                '<(libchromiumcontent_library_dir)/libEGL.dll',
                 '<(libchromiumcontent_library_dir)/libGLESv2.dll',
+                '<(libchromiumcontent_resources_dir)/icudtl.dat',
+                '<(libchromiumcontent_resources_dir)/content_resources_200_percent.pak',
                 '<(libchromiumcontent_resources_dir)/content_shell.pak',
+                '<(libchromiumcontent_resources_dir)/ui_resources_200_percent.pak',
+                'external_binaries/d3dcompiler_46.dll',
+                'external_binaries/msvcp120.dll',
+                'external_binaries/msvcr120.dll',
+                'external_binaries/vccorlib120.dll',
+                'external_binaries/xinput1_3.dll',
               ],
             },
             {
@@ -342,6 +514,7 @@
               'files': [
                 '<(libchromiumcontent_library_dir)/libchromiumcontent.so',
                 '<(libchromiumcontent_library_dir)/libffmpegsumo.so',
+                '<(libchromiumcontent_resources_dir)/icudtl.dat',
                 '<(libchromiumcontent_resources_dir)/content_shell.pak',
               ],
             },
@@ -359,15 +532,27 @@
       'target_name': '<(project_name)_lib',
       'type': 'static_library',
       'dependencies': [
+        'atom_coffee2c',
         'vendor/brightray/brightray.gyp:brightray',
         'vendor/node/node.gyp:node_lib',
       ],
+      'defines': [
+        'PRODUCT_NAME="<(product_name)"',
+        # This is defined in skia/skia_common.gypi.
+        'SK_SUPPORT_LEGACY_GETTOPDEVICE',
+        # Disable warnings for g_settings_list_schemas.
+        'GLIB_DISABLE_DEPRECATION_WARNINGS',
+      ],
       'sources': [
         '<@(lib_sources)',
       ],
       'include_dirs': [
         '.',
+        'chromium_src',
         'vendor/brightray',
+        'vendor/native_mate',
+        # Include atom_natives.h.
+        '<(SHARED_INTERMEDIATE_DIR)',
         # Include directories for uv and node.
         'vendor/node/src',
         'vendor/node/deps/http_parser',
@@ -376,6 +561,8 @@
         'vendor/brightray/vendor/download/libchromiumcontent/src/v8/include',
         # The `node.h` is using `#include"ares.h"`.
         'vendor/node/deps/cares/include',
+        # The `third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h` is using `platform/PlatformExport.h`.
+        'vendor/brightray/vendor/download/libchromiumcontent/src/third_party/WebKit/Source',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -387,13 +574,15 @@
       ],
       'conditions': [
         ['OS=="win"', {
+          'sources': [
+            '<@(lib_sources_win)',
+          ],
           'link_settings': {
             'libraries': [
               '-limm32.lib',
               '-loleacc.lib',
               '-lComdlg32.lib',
               '-lWininet.lib',
-              '<(atom_source_root)/<(libchromiumcontent_library_dir)/chromiumviews.lib',
             ],
           },
           'dependencies': [
@@ -422,7 +611,10 @@
             'vendor/breakpad/src',
           ],
           'cflags': [
+            '<!@(pkg-config --cflags dbus-1)',
+            '-Wno-deprecated-register',
             '-Wno-empty-body',
+            '-Wno-reserved-user-defined-literal',
           ],
           'dependencies': [
             'vendor/breakpad/breakpad.gyp:breakpad_client',
@@ -431,44 +623,56 @@
       ],
     },  # target <(product_name)_lib
     {
-      'target_name': 'generated_sources',
+      'target_name': 'compile_coffee',
       'type': 'none',
-      'sources': [
-        '<@(coffee_sources)',
-      ],
-      'rules': [
+      'actions': [
         {
-          'rule_name': 'coffee',
-          'extension': 'coffee',
+          'action_name': 'compile_coffee',
+          'variables': {
+            'conditions': [
+              ['OS=="mac"', {
+                'resources_path': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources',
+              },{
+                'resources_path': '<(PRODUCT_DIR)/resources',
+              }],
+            ],
+          },
           'inputs': [
-            'script/compile-coffee.py',
+            '<@(coffee_sources)',
           ],
-          'conditions': [
-            ['OS=="mac"', {
-              'outputs': [
-                '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
-              ],
-              'action': [
-                'python',
-                'script/compile-coffee.py',
-                '<(RULE_INPUT_PATH)',
-                '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
-              ],
-            },{  # OS=="mac"
-              'outputs': [
-                '<(PRODUCT_DIR)/resources/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
-              ],
-              'action': [
-                'python',
-                'script/compile-coffee.py',
-                '<(RULE_INPUT_PATH)',
-                '<(PRODUCT_DIR)/resources/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
-              ],
-            }],  # OS=="win" or OS=="linux"
+          'outputs': [
+            '<(resources_path)/atom.asar',
           ],
-        },
+          'action': [
+            'python',
+            'tools/coffee2asar.py',
+            '<@(_outputs)',
+            '<@(_inputs)',
+          ],
+        }
       ],
-    },  # target generated_sources
+    },  # target compile_coffee
+    {
+      'target_name': 'atom_coffee2c',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'atom_coffee2c',
+          'inputs': [
+            '<@(coffee2c_sources)',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/atom_natives.h',
+          ],
+          'action': [
+            'python',
+            'tools/coffee2c.py',
+            '<@(_outputs)',
+            '<@(_inputs)',
+          ],
+        }
+      ],
+    },  # target atom_coffee2c
     {
       'target_name': '<(project_name)_dump_symbols',
       'type': 'none',
@@ -562,19 +766,52 @@
                 # Gyp action requires a output file, add a fake one here.
                 '<(PRODUCT_DIR)/dummy_file',
               ],
-              'action': [ 'strip', '<@(_inputs)' ],
+              'action': [
+                'tools/posix/strip.sh',
+                '<@(_inputs)',
+              ],
             },
           ],
         }],  # OS=="linux"
       ],
     },  # target <(project_name>_dump_symbols
+    {
+      'target_name': 'copy_chromedriver',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'Copy ChromeDriver Binary',
+          'variables': {
+            'conditions': [
+              ['OS=="win"', {
+                'chromedriver_binary': 'chromedriver.exe',
+              },{
+                'chromedriver_binary': 'chromedriver',
+              }],
+            ],
+          },
+          'inputs': [
+            '<(libchromiumcontent_library_dir)/<(chromedriver_binary)',
+          ],
+          'outputs': [
+            '<(PRODUCT_DIR)/<(chromedriver_binary)',
+          ],
+          'action': [
+            'python',
+            'tools/copy_binary.py',
+            '<@(_inputs)',
+            '<@(_outputs)',
+          ],
+        }
+      ],
+    },  # copy_chromedriver
   ],
   'conditions': [
     ['OS=="mac"', {
       'targets': [
         {
           'target_name': '<(project_name)_framework',
-          'product_name': '<(framework_name)',
+          'product_name': '<(product_name) Framework',
           'type': 'shared_library',
           'dependencies': [
             '<(project_name)_lib',
@@ -587,28 +824,33 @@
             'vendor',
             '<(libchromiumcontent_include_dir)',
           ],
+          'defines': [
+            'PRODUCT_NAME="<(product_name)"',
+          ],
           'export_dependent_settings': [
             '<(project_name)_lib',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
-              'frameworks/Squirrel.framework',
-              'frameworks/ReactiveCocoa.framework',
-              'frameworks/Mantle.framework',
+              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+              'external_binaries/Squirrel.framework',
+              'external_binaries/ReactiveCocoa.framework',
+              'external_binaries/Mantle.framework',
             ],
           },
           'mac_bundle': 1,
           'mac_bundle_resources': [
             'atom/common/resources/mac/MainMenu.xib',
             '<(libchromiumcontent_resources_dir)/content_shell.pak',
+            '<(libchromiumcontent_resources_dir)/icudtl.dat',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'atom/common/resources/mac/Info.plist',
             'LIBRARY_SEARCH_PATHS': [
               '<(libchromiumcontent_library_dir)',
             ],
-            'LD_DYLIB_INSTALL_NAME': '@rpath/<(framework_name).framework/<(framework_name)',
+            'LD_DYLIB_INSTALL_NAME': '@rpath/<(product_name) Framework.framework/<(product_name) Framework',
             'LD_RUNPATH_SEARCH_PATHS': [
               '@loader_path/Libraries',
             ],
@@ -618,14 +860,14 @@
           },
           'copies': [
             {
-              'destination': '<(PRODUCT_DIR)/<(framework_name).framework/Versions/A/Libraries',
+              'destination': '<(PRODUCT_DIR)/<(product_name) Framework.framework/Versions/A/Libraries',
               'files': [
                 '<(libchromiumcontent_library_dir)/ffmpegsumo.so',
                 '<(libchromiumcontent_library_dir)/libchromiumcontent.dylib',
               ],
             },
             {
-              'destination': '<(PRODUCT_DIR)/<(framework_name).framework/Versions/A/Resources',
+              'destination': '<(PRODUCT_DIR)/<(product_name) Framework.framework/Versions/A/Resources',
               'files': [
                 '<(PRODUCT_DIR)/Inspector',
                 '<(PRODUCT_DIR)/crash_report_sender.app',
@@ -637,7 +879,7 @@
               'postbuild_name': 'Add symlinks for framework subdirectories',
               'action': [
                 'tools/mac/create-framework-subdir-symlinks.sh',
-                '<(framework_name)',
+                '<(product_name) Framework',
                 'Libraries',
                 'Frameworks',
               ],
@@ -666,7 +908,32 @@
           },
         },  # target helper
       ],
-    }],  # OS==Mac
+    }, {  # OS=="mac"
+      'targets': [
+        {
+          'target_name': 'make_locale_paks',
+          'type': 'none',
+          'actions': [
+            {
+              'action_name': 'Make Empty Paks',
+              'inputs': [
+                'tools/make_locale_paks.py',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/locales'
+              ],
+              'action': [
+                'python',
+                'tools/make_locale_paks.py',
+                '<(PRODUCT_DIR)',
+                '<@(locales)',
+              ],
+              'msvs_cygwin_shell': 0,
+            },
+          ],
+        },
+      ],
+    }],  # OS!="mac"
     ['OS=="win"', {
       'targets': [
         {
@@ -679,7 +946,7 @@
             {
               'action_name': 'Create node.lib',
               'inputs': [
-                '<(PRODUCT_DIR)/atom.lib',
+                '<(PRODUCT_DIR)/<(project_name).lib',
                 '<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib',
               ],
               'outputs': [

atom/app/atom_content_client.cc

@@ -0,0 +1,30 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/app/atom_content_client.h"
+
+#include <string>
+#include <vector>
+
+#include "atom/common/chrome_version.h"
+
+namespace atom {
+
+AtomContentClient::AtomContentClient() {
+}
+
+AtomContentClient::~AtomContentClient() {
+}
+
+std::string AtomContentClient::GetProduct() const {
+  return "Chrome/" CHROME_VERSION_STRING;
+}
+
+void AtomContentClient::AddAdditionalSchemes(
+    std::vector<std::string>* standard_schemes,
+    std::vector<std::string>* savable_schemes) {
+  standard_schemes->push_back("chrome-extension");
+}
+
+}  // namespace atom

atom/app/atom_content_client.h

@@ -0,0 +1,33 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_APP_ATOM_CONTENT_CLIENT_H_
+#define ATOM_APP_ATOM_CONTENT_CLIENT_H_
+
+#include <string>
+#include <vector>
+
+#include "brightray/common/content_client.h"
+
+namespace atom {
+
+class AtomContentClient : public brightray::ContentClient {
+ public:
+  AtomContentClient();
+  virtual ~AtomContentClient();
+
+ protected:
+  // content::ContentClient:
+  std::string GetProduct() const override;
+  void AddAdditionalSchemes(
+      std::vector<std::string>* standard_schemes,
+      std::vector<std::string>* savable_schemes) override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AtomContentClient);
+};
+
+}  // namespace atom
+
+#endif  // ATOM_APP_ATOM_CONTENT_CLIENT_H_

atom/app/atom_library_main.cc

@@ -1,15 +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 "atom/app/atom_library_main.h"
-
-#include "atom/app/atom_main_delegate.h"
-#include "content/public/app/content_main.h"
-
-#if defined(OS_MACOSX)
-int AtomMain(int argc, const char* argv[]) {
-  atom::AtomMainDelegate delegate;
-  return content::ContentMain(argc, argv, &delegate);
-}
-#endif  // OS_MACOSX

atom/app/atom_library_main.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_APP_ATOM_LIBRARY_MAIN_H_
@@ -11,6 +11,9 @@
 extern "C" {
 __attribute__((visibility("default")))
 int AtomMain(int argc, const char* argv[]);
+
+__attribute__((visibility("default")))
+void AtomInitializeICU();
 }
 #endif  // OS_MACOSX
 

atom/app/atom_library_main.mm

@@ -0,0 +1,30 @@
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/app/atom_library_main.h"
+
+#include "atom/app/atom_main_delegate.h"
+#include "base/i18n/icu_util.h"
+#include "base/mac/bundle_locations.h"
+#include "brightray/common/mac/main_application_bundle.h"
+#include "content/public/app/content_main.h"
+
+#if defined(OS_MACOSX)
+int AtomMain(int argc, const char* argv[]) {
+  atom::AtomMainDelegate delegate;
+  content::ContentMainParams params(&delegate);
+  params.argc = argc;
+  params.argv = argv;
+  return content::ContentMain(params);
+}
+
+void AtomInitializeICU() {
+  base::mac::SetOverrideFrameworkBundlePath(
+      brightray::MainApplicationBundlePath()
+          .Append("Contents")
+          .Append("Frameworks")
+          .Append(PRODUCT_NAME " Framework.framework"));
+  base::i18n::InitializeICU();
+}
+#endif  // OS_MACOSX

atom/app/atom_main.cc

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/app/atom_main.h"
@@ -13,13 +13,17 @@
 #include <fcntl.h>
 
 #include <windows.h>
+#include <shellscalingapi.h>
+#include <tchar.h>
 #include <shellapi.h>
 
 #include "atom/app/atom_main_delegate.h"
-#include "base/environment.h"
 #include "atom/common/crash_reporter/win/crash_service_main.h"
+#include "base/environment.h"
+#include "base/win/windows_version.h"
 #include "content/public/app/startup_helper_win.h"
 #include "sandbox/win/src/sandbox_types.h"
+#include "ui/gfx/win/dpi.h"
 #elif defined(OS_LINUX)  // defined(OS_WIN)
 #include "atom/app/atom_main_delegate.h"  // NOLINT
 #include "content/public/app/content_main.h"
@@ -27,6 +31,8 @@
 #include "atom/app/atom_library_main.h"
 #endif  // defined(OS_MACOSX)
 
+#include "base/i18n/icu_util.h"
+
 // Declaration of node::Start.
 namespace node {
 int Start(int argc, char *argv[]);
@@ -34,6 +40,48 @@ int Start(int argc, char *argv[]);
 
 #if defined(OS_WIN)
 
+namespace {
+
+// Win8.1 supports monitor-specific DPI scaling.
+bool SetProcessDpiAwarenessWrapper(PROCESS_DPI_AWARENESS value) {
+  typedef HRESULT(WINAPI *SetProcessDpiAwarenessPtr)(PROCESS_DPI_AWARENESS);
+  SetProcessDpiAwarenessPtr set_process_dpi_awareness_func =
+      reinterpret_cast<SetProcessDpiAwarenessPtr>(
+          GetProcAddress(GetModuleHandleA("user32.dll"),
+                         "SetProcessDpiAwarenessInternal"));
+  if (set_process_dpi_awareness_func) {
+    HRESULT hr = set_process_dpi_awareness_func(value);
+    if (SUCCEEDED(hr)) {
+      VLOG(1) << "SetProcessDpiAwareness succeeded.";
+      return true;
+    } else if (hr == E_ACCESSDENIED) {
+      LOG(ERROR) << "Access denied error from SetProcessDpiAwareness. "
+          "Function called twice, or manifest was used.";
+    }
+  }
+  return false;
+}
+
+// This function works for Windows Vista through Win8. Win8.1 must use
+// SetProcessDpiAwareness[Wrapper].
+BOOL SetProcessDPIAwareWrapper() {
+  typedef BOOL(WINAPI *SetProcessDPIAwarePtr)(VOID);
+  SetProcessDPIAwarePtr set_process_dpi_aware_func =
+      reinterpret_cast<SetProcessDPIAwarePtr>(
+      GetProcAddress(GetModuleHandleA("user32.dll"),
+                      "SetProcessDPIAware"));
+  return set_process_dpi_aware_func &&
+    set_process_dpi_aware_func();
+}
+
+void EnableHighDPISupport() {
+  if (!SetProcessDpiAwarenessWrapper(PROCESS_SYSTEM_DPI_AWARE)) {
+    SetProcessDPIAwareWrapper();
+  }
+}
+
+}  // namespace
+
 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
   int argc = 0;
   wchar_t** wargv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
@@ -88,6 +136,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
       }
     }
     // Now that conversion is done, we can finally start.
+    base::i18n::InitializeICU();
     return node::Start(argc, argv);
   } else if (env->GetVar("ATOM_SHELL_INTERNAL_CRASH_SERVICE",
                          &crash_service_indicator) &&
@@ -98,26 +147,43 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   content::InitializeSandboxInfo(&sandbox_info);
   atom::AtomMainDelegate delegate;
-  return content::ContentMain(instance, &sandbox_info, &delegate);
+
+  // We don't want to set DPI awareness on pre-Win7 because we don't support
+  // DirectWrite there. GDI fonts are kerned very badly, so better to leave
+  // DPI-unaware and at effective 1.0. See also ShouldUseDirectWrite().
+  if (base::win::GetVersion() >= base::win::VERSION_WIN7)
+    EnableHighDPISupport();
+
+  content::ContentMainParams params(&delegate);
+  params.instance = instance;
+  params.sandbox_info = &sandbox_info;
+  return content::ContentMain(params);
 }
 
 #elif defined(OS_LINUX)  // defined(OS_WIN)
 
 int main(int argc, const char* argv[]) {
   char* node_indicator = getenv("ATOM_SHELL_INTERNAL_RUN_AS_NODE");
-  if (node_indicator != NULL && strcmp(node_indicator, "1") == 0)
+  if (node_indicator != NULL && strcmp(node_indicator, "1") == 0) {
+    base::i18n::InitializeICU();
     return node::Start(argc, const_cast<char**>(argv));
+  }
 
   atom::AtomMainDelegate delegate;
-  return content::ContentMain(argc, argv, &delegate);
+  content::ContentMainParams params(&delegate);
+  params.argc = argc;
+  params.argv = argv;
+  return content::ContentMain(params);
 }
 
 #else  // defined(OS_LINUX)
 
 int main(int argc, const char* argv[]) {
   char* node_indicator = getenv("ATOM_SHELL_INTERNAL_RUN_AS_NODE");
-  if (node_indicator != NULL && strcmp(node_indicator, "1") == 0)
+  if (node_indicator != NULL && strcmp(node_indicator, "1") == 0) {
+    AtomInitializeICU();
     return node::Start(argc, const_cast<char**>(argv));
+  }
 
   return AtomMain(argc, argv);
 }

atom/app/atom_main.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_APP_ATOM_MAIN_H_

atom/app/atom_main_delegate.cc

@@ -1,19 +1,21 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/app/atom_main_delegate.h"
 
 #include <string>
 
+#include "atom/app/atom_content_client.h"
+#include "atom/browser/atom_browser_client.h"
+#include "atom/common/google_api_key.h"
+#include "atom/renderer/atom_renderer_client.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
+#include "base/environment.h"
 #include "base/logging.h"
-#include "atom/browser/atom_browser_client.h"
 #include "content/public/common/content_switches.h"
-#include "atom/renderer/atom_renderer_client.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "base/path_service.h"
 
 namespace atom {
 
@@ -35,8 +37,6 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
 #else
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
 #endif
-  settings.dcheck_state =
-      logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
   logging::InitLogging(settings);
 #endif  // defined(OS_WIN)
 
@@ -52,11 +52,12 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
 }
 
 void AtomMainDelegate::PreSandboxStartup() {
-#if defined(OS_MACOSX)
-  OverrideChildProcessPath();
-  OverrideFrameworkBundlePath();
-#endif
-  InitializeResourceBundle();
+  brightray::MainDelegate::PreSandboxStartup();
+
+  // Set google API key.
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  if (!env->HasVar("GOOGLE_API_KEY"))
+    env->SetVar("GOOGLE_API_KEY", GOOGLEAPIS_API_KEY);
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   std::string process_type = command_line->GetSwitchValueASCII(
@@ -69,24 +70,23 @@ void AtomMainDelegate::PreSandboxStartup() {
   // Add a flag to mark the start of switches added by atom-shell.
   command_line->AppendSwitch("atom-shell-switches-start");
 
+#if defined(OS_WIN)
+  // Disable the LegacyRenderWidgetHostHWND, it made frameless windows unable
+  // to move and resize. We may consider enabling it again after upgraded to
+  // Chrome 38, which should have fixed the problem.
+  command_line->AppendSwitch(switches::kDisableLegacyIntermediateWindow);
+#endif
+
   // Disable renderer sandbox for most of node's functions.
   command_line->AppendSwitch(switches::kNoSandbox);
 
-  // Add a flag to mark the end of switches added by atom-shell.
-  command_line->AppendSwitch("atom-shell-switches-end");
-}
-
-void AtomMainDelegate::InitializeResourceBundle() {
-  base::FilePath path;
 #if defined(OS_MACOSX)
-  path = GetResourcesPakFilePath();
-#else
-  base::FilePath pak_dir;
-  PathService::Get(base::DIR_MODULE, &pak_dir);
-  path = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
+  // Enable AVFoundation.
+  command_line->AppendSwitch("enable-avfoundation");
 #endif
 
-  ui::ResourceBundle::InitSharedInstanceWithPakPath(path);
+  // Add a flag to mark the end of switches added by atom-shell.
+  command_line->AppendSwitch("atom-shell-switches-end");
 }
 
 content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() {
@@ -100,4 +100,20 @@ content::ContentRendererClient*
   return renderer_client_.get();
 }
 
+scoped_ptr<brightray::ContentClient> AtomMainDelegate::CreateContentClient() {
+  return scoped_ptr<brightray::ContentClient>(new AtomContentClient).Pass();
+}
+
+void AtomMainDelegate::AddDataPackFromPath(
+    ui::ResourceBundle* bundle, const base::FilePath& pak_dir) {
+#if defined(OS_WIN)
+  bundle->AddDataPackFromPath(
+      pak_dir.Append(FILE_PATH_LITERAL("ui_resources_200_percent.pak")),
+      ui::SCALE_FACTOR_200P);
+  bundle->AddDataPackFromPath(
+      pak_dir.Append(FILE_PATH_LITERAL("content_resources_200_percent.pak")),
+      ui::SCALE_FACTOR_200P);
+#endif
+}
+
 }  // namespace atom

atom/app/atom_main_delegate.h

@@ -1,11 +1,12 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_APP_ATOM_MAIN_DELEGATE_H_
 #define ATOM_APP_ATOM_MAIN_DELEGATE_H_
 
 #include "brightray/common/main_delegate.h"
+#include "brightray/common/content_client.h"
 
 namespace atom {
 
@@ -15,21 +16,23 @@ class AtomMainDelegate : public brightray::MainDelegate {
   ~AtomMainDelegate();
 
  protected:
-  virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
-  virtual void PreSandboxStartup() OVERRIDE;
-  virtual void InitializeResourceBundle();
+  // content::ContentMainDelegate:
+  bool BasicStartupComplete(int* exit_code) override;
+  void PreSandboxStartup() override;
+  content::ContentBrowserClient* CreateContentBrowserClient() override;
+  content::ContentRendererClient* CreateContentRendererClient() override;
 
+  // brightray::MainDelegate:
+  scoped_ptr<brightray::ContentClient> CreateContentClient() override;
+  void AddDataPackFromPath(
+      ui::ResourceBundle* bundle, const base::FilePath& pak_dir) override;
 #if defined(OS_MACOSX)
-  virtual base::FilePath GetResourcesPakFilePath();
-  virtual void OverrideChildProcessPath();
-  virtual void OverrideFrameworkBundlePath();
+  void OverrideChildProcessPath() override;
+  void OverrideFrameworkBundlePath() override;
 #endif
 
  private:
-  virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
-  virtual content::ContentRendererClient*
-      CreateContentRendererClient() OVERRIDE;
-
+  brightray::ContentClient content_client_;
   scoped_ptr<content::ContentBrowserClient> browser_client_;
   scoped_ptr<content::ContentRendererClient> renderer_client_;
 

atom/app/atom_main_delegate_mac.mm

@@ -1,19 +1,14 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/app/atom_main_delegate.h"
 
-#import "base/mac/bundle_locations.h"
-#import "base/mac/foundation_util.h"
-#import "base/mac/mac_util.h"
-#include "base/command_line.h"
+#include "base/mac/bundle_locations.h"
+#include "base/files/file_path.h"
 #include "base/path_service.h"
-#include "base/strings/sys_string_conversions.h"
+#include "brightray/common/mac/main_application_bundle.h"
 #include "content/public/common/content_paths.h"
-#include "content/public/common/content_switches.h"
-#include "vendor/brightray/common/application_info.h"
-#include "vendor/brightray/common/mac/main_application_bundle.h"
 
 namespace atom {
 
@@ -26,22 +21,17 @@ base::FilePath GetFrameworksPath() {
 
 }  // namespace
 
-base::FilePath AtomMainDelegate::GetResourcesPakFilePath() {
-  NSString* path = [base::mac::FrameworkBundle()
-      pathForResource:@"content_shell" ofType:@"pak"];
-  return base::mac::NSStringToFilePath(path);
-}
-
 void AtomMainDelegate::OverrideFrameworkBundlePath() {
   base::mac::SetOverrideFrameworkBundlePath(
-      GetFrameworksPath().Append("Atom Framework.framework"));
+      GetFrameworksPath().Append(PRODUCT_NAME " Framework.framework"));
 }
 
 void AtomMainDelegate::OverrideChildProcessPath() {
-  base::FilePath helper_path = GetFrameworksPath().Append("Atom Helper.app")
-                                                  .Append("Contents")
-                                                  .Append("MacOS")
-                                                  .Append("Atom Helper");
+  base::FilePath helper_path =
+      GetFrameworksPath().Append(PRODUCT_NAME " Helper.app")
+                         .Append("Contents")
+                         .Append("MacOS")
+                         .Append(PRODUCT_NAME " Helper");
   PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
 }
 

atom/browser/api/atom_api_app.cc

@@ -1,24 +1,129 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/api/atom_api_app.h"
 
 #include <string>
+#include <vector>
 
-#include "base/values.h"
-#include "base/command_line.h"
+#include "atom/browser/api/atom_api_menu.h"
+#include "atom/browser/atom_browser_context.h"
 #include "atom/browser/browser.h"
-#include "atom/common/v8/native_type_conversions.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/native_mate_converters/gurl_converter.h"
+#include "base/command_line.h"
+#include "base/environment.h"
+#include "base/files/file_path.h"
+#include "base/path_service.h"
+#include "brightray/browser/brightray_paths.h"
+#include "native_mate/callback.h"
+#include "native_mate/dictionary.h"
+#include "native_mate/object_template_builder.h"
+#include "net/base/load_flags.h"
+#include "net/proxy/proxy_service.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
+
+#include "atom/common/node_includes.h"
+
+using atom::Browser;
+
+namespace mate {
+
+#if defined(OS_WIN)
+template<>
+struct Converter<Browser::UserTask> {
+  static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
+                     Browser::UserTask* out) {
+    mate::Dictionary dict;
+    if (!ConvertFromV8(isolate, val, &dict))
+      return false;
+    if (!dict.Get("program", &(out->program)) ||
+        !dict.Get("title", &(out->title)))
+      return false;
+    if (dict.Get("iconPath", &(out->icon_path)) &&
+        !dict.Get("iconIndex", &(out->icon_index)))
+      return false;
+    dict.Get("arguments", &(out->arguments));
+    dict.Get("description", &(out->description));
+    return true;
+  }
+};
+#endif
+
+}  // namespace mate
 
-#include "atom/common/v8/node_common.h"
 
 namespace atom {
 
 namespace api {
 
-App::App(v8::Handle<v8::Object> wrapper)
-    : EventEmitter(wrapper) {
+namespace {
+
+// Return the path constant from string.
+int GetPathConstant(const std::string& name) {
+  if (name == "appData")
+    return brightray::DIR_APP_DATA;
+  else if (name == "userData")
+    return brightray::DIR_USER_DATA;
+  else if (name == "cache")
+    return brightray::DIR_CACHE;
+  else if (name == "userCache")
+    return brightray::DIR_USER_CACHE;
+  else if (name == "home")
+    return base::DIR_HOME;
+  else if (name == "temp")
+    return base::DIR_TEMP;
+  else if (name == "userDesktop")
+    return base::DIR_USER_DESKTOP;
+  else if (name == "exe")
+    return base::FILE_EXE;
+  else if (name == "module")
+    return base::FILE_MODULE;
+  else
+    return -1;
+}
+
+class ResolveProxyHelper {
+ public:
+  ResolveProxyHelper(const GURL& url, App::ResolveProxyCallback callback)
+      : callback_(callback) {
+    net::ProxyService* proxy_service = AtomBrowserContext::Get()->
+        url_request_context_getter()->GetURLRequestContext()->proxy_service();
+
+    // Start the request.
+    int result = proxy_service->ResolveProxy(
+        url, net::LOAD_NORMAL, &proxy_info_,
+        base::Bind(&ResolveProxyHelper::OnResolveProxyCompleted,
+                   base::Unretained(this)),
+        &pac_req_, nullptr, net::BoundNetLog());
+
+    // Completed synchronously.
+    if (result != net::ERR_IO_PENDING)
+      OnResolveProxyCompleted(result);
+  }
+
+  void OnResolveProxyCompleted(int result) {
+    std::string proxy;
+    if (result == net::OK)
+      proxy = proxy_info_.ToPacString();
+    callback_.Run(proxy);
+
+    delete this;
+  }
+
+ private:
+  App::ResolveProxyCallback callback_;
+  net::ProxyInfo proxy_info_;
+  net::ProxyService::PacRequest* pac_req_;
+
+  DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
+};
+
+}  // namespace
+
+App::App() {
   Browser::Get()->AddObserver(this);
 }
 
@@ -26,6 +131,10 @@ App::~App() {
   Browser::Get()->RemoveObserver(this);
 }
 
+void App::OnBeforeQuit(bool* prevent_default) {
+  *prevent_default = Emit("before-quit");
+}
+
 void App::OnWillQuit(bool* prevent_default) {
   *prevent_default = Emit("will-quit");
 }
@@ -34,16 +143,16 @@ void App::OnWindowAllClosed() {
   Emit("window-all-closed");
 }
 
+void App::OnQuit() {
+  Emit("quit");
+}
+
 void App::OnOpenFile(bool* prevent_default, const std::string& file_path) {
-  base::ListValue args;
-  args.AppendString(file_path);
-  *prevent_default = Emit("open-file", &args);
+  *prevent_default = Emit("open-file", file_path);
 }
 
 void App::OnOpenURL(const std::string& url) {
-  base::ListValue args;
-  args.AppendString(url);
-  Emit("open-url", &args);
+  Emit("open-url", url);
 }
 
 void App::OnActivateWithNoOpenWindows() {
@@ -58,156 +167,125 @@ void App::OnFinishLaunching() {
   Emit("ready");
 }
 
-// static
-void App::New(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  v8::HandleScope scope(args.GetIsolate());
+base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {
+  bool succeed = false;
+  base::FilePath path;
+  int key = GetPathConstant(name);
+  if (key >= 0)
+    succeed = PathService::Get(key, &path);
+  if (!succeed)
+    args->ThrowError("Failed to get path");
+  return path;
+}
 
-  if (!args.IsConstructCall())
-    return node::ThrowError("Require constructor call");
+void App::SetPath(mate::Arguments* args,
+                  const std::string& name,
+                  const base::FilePath& path) {
+  bool succeed = false;
+  int key = GetPathConstant(name);
+  if (key >= 0)
+    succeed = PathService::Override(key, path);
+  if (!succeed)
+    args->ThrowError("Failed to set path");
+}
 
-  new App(args.This());
+void App::ResolveProxy(const GURL& url, ResolveProxyCallback callback) {
+  new ResolveProxyHelper(url, callback);
+}
+
+void App::SetDesktopName(const std::string& desktop_name) {
+#if defined(OS_LINUX)
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  env->SetVar("CHROME_DESKTOP", desktop_name);
+#endif
+}
+
+mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  auto browser = base::Unretained(Browser::Get());
+  return mate::ObjectTemplateBuilder(isolate)
+      .SetMethod("quit", base::Bind(&Browser::Quit, browser))
+      .SetMethod("focus", base::Bind(&Browser::Focus, browser))
+      .SetMethod("getVersion", base::Bind(&Browser::GetVersion, browser))
+      .SetMethod("setVersion", base::Bind(&Browser::SetVersion, browser))
+      .SetMethod("getName", base::Bind(&Browser::GetName, browser))
+      .SetMethod("setName", base::Bind(&Browser::SetName, browser))
+      .SetMethod("isReady", base::Bind(&Browser::is_ready, browser))
+      .SetMethod("addRecentDocument",
+                 base::Bind(&Browser::AddRecentDocument, browser))
+      .SetMethod("clearRecentDocuments",
+                 base::Bind(&Browser::ClearRecentDocuments, browser))
+#if defined(OS_WIN)
+      .SetMethod("setUserTasks",
+                 base::Bind(&Browser::SetUserTasks, browser))
+#endif
+      .SetMethod("setPath", &App::SetPath)
+      .SetMethod("getPath", &App::GetPath)
+      .SetMethod("resolveProxy", &App::ResolveProxy)
+      .SetMethod("setDesktopName", &App::SetDesktopName);
 }
 
 // static
-void App::Quit(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  Browser::Get()->Quit();
-}
-
-// static
-void App::Exit(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  exit(args[0]->IntegerValue());
-}
-
-// static
-void App::Terminate(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  Browser::Get()->Terminate();
-}
-
-// static
-void App::Focus(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  Browser::Get()->Focus();
-}
-
-// static
-void App::GetVersion(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  args.GetReturnValue().Set(ToV8Value(Browser::Get()->GetVersion()));
-}
-
-// static
-void App::SetVersion(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string version;
-  if (!FromV8Arguments(args, &version))
-    return node::ThrowError("Bad argument");
-
-  Browser::Get()->SetVersion(version);
-}
-
-// static
-void App::GetName(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  return args.GetReturnValue().Set(ToV8Value(Browser::Get()->GetName()));
-}
-
-// static
-void App::SetName(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string name;
-  if (!FromV8Arguments(args, &name))
-    return node::ThrowError("Bad argument");
-
-  Browser::Get()->SetName(name);
-}
-
-// static
-void App::AppendSwitch(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string switch_string;
-  if (!FromV8Arguments(args, &switch_string))
-    return node::ThrowError("Bad argument");
-
-  if (args.Length() == 1) {
-    CommandLine::ForCurrentProcess()->AppendSwitch(switch_string);
-  } else {
-    std::string value = FromV8Value(args[1]);
-    CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-        switch_string, value);
-  }
-}
-
-// static
-void App::AppendArgument(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string value;
-  if (!FromV8Arguments(args, &value))
-    return node::ThrowError("Bad argument");
-
-  CommandLine::ForCurrentProcess()->AppendArg(value);
-}
-
-#if defined(OS_MACOSX)
-
-// static
-void App::DockBounce(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string type;
-  if (!FromV8Arguments(args, &type))
-    return node::ThrowError("Bad argument");
-
-  int request_id = -1;
-
-  if (type == "critical")
-    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_CRITICAL);
-  else if (type == "informational")
-    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_INFORMATIONAL);
-  else
-    return node::ThrowTypeError("Invalid bounce type");
-
-  args.GetReturnValue().Set(request_id);
-}
-
-// static
-void App::DockCancelBounce(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  Browser::Get()->DockCancelBounce(FromV8Value(args[0]));
-}
-
-// static
-void App::DockSetBadgeText(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  Browser::Get()->DockSetBadgeText(FromV8Value(args[0]));
-}
-
-// static
-void App::DockGetBadgeText(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string text(Browser::Get()->DockGetBadgeText());
-  args.GetReturnValue().Set(ToV8Value(text));
-}
-
-#endif  // defined(OS_MACOSX)
-
-// static
-void App::Initialize(v8::Handle<v8::Object> target) {
-  v8::Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(New);
-  t->InstanceTemplate()->SetInternalFieldCount(1);
-  t->SetClassName(v8::String::NewSymbol("Application"));
-
-  NODE_SET_PROTOTYPE_METHOD(t, "quit", Quit);
-  NODE_SET_PROTOTYPE_METHOD(t, "exit", Exit);
-  NODE_SET_PROTOTYPE_METHOD(t, "terminate", Terminate);
-  NODE_SET_PROTOTYPE_METHOD(t, "focus", Focus);
-  NODE_SET_PROTOTYPE_METHOD(t, "getVersion", GetVersion);
-  NODE_SET_PROTOTYPE_METHOD(t, "setVersion", SetVersion);
-  NODE_SET_PROTOTYPE_METHOD(t, "getName", GetName);
-  NODE_SET_PROTOTYPE_METHOD(t, "setName", SetName);
-
-  target->Set(v8::String::NewSymbol("Application"), t->GetFunction());
-
-  NODE_SET_METHOD(target, "appendSwitch", AppendSwitch);
-  NODE_SET_METHOD(target, "appendArgument", AppendArgument);
-
-#if defined(OS_MACOSX)
-  NODE_SET_METHOD(target, "dockBounce", DockBounce);
-  NODE_SET_METHOD(target, "dockCancelBounce", DockCancelBounce);
-  NODE_SET_METHOD(target, "dockSetBadgeText", DockSetBadgeText);
-  NODE_SET_METHOD(target, "dockGetBadgeText", DockGetBadgeText);
-#endif  // defined(OS_MACOSX)
+mate::Handle<App> App::Create(v8::Isolate* isolate) {
+  return CreateHandle(isolate, new App);
 }
 
 }  // namespace api
 
 }  // namespace atom
 
-NODE_MODULE(atom_browser_app, atom::api::App::Initialize)
+
+namespace {
+
+void AppendSwitch(const std::string& switch_string, mate::Arguments* args) {
+  std::string value;
+  if (args->GetNext(&value))
+    CommandLine::ForCurrentProcess()->AppendSwitchASCII(switch_string, value);
+  else
+    CommandLine::ForCurrentProcess()->AppendSwitch(switch_string);
+}
+
+#if defined(OS_MACOSX)
+int DockBounce(const std::string& type) {
+  int request_id = -1;
+  if (type == "critical")
+    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_CRITICAL);
+  else if (type == "informational")
+    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_INFORMATIONAL);
+  return request_id;
+}
+
+void DockSetMenu(atom::api::Menu* menu) {
+  Browser::Get()->DockSetMenu(menu->model());
+}
+#endif
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  v8::Isolate* isolate = context->GetIsolate();
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+
+  mate::Dictionary dict(isolate, exports);
+  dict.Set("app", atom::api::App::Create(isolate));
+  dict.SetMethod("appendSwitch", &AppendSwitch);
+  dict.SetMethod("appendArgument",
+                 base::Bind(&CommandLine::AppendArg,
+                            base::Unretained(command_line)));
+#if defined(OS_MACOSX)
+  auto browser = base::Unretained(Browser::Get());
+  dict.SetMethod("dockBounce", &DockBounce);
+  dict.SetMethod("dockCancelBounce",
+                 base::Bind(&Browser::DockCancelBounce, browser));
+  dict.SetMethod("dockSetBadgeText",
+                 base::Bind(&Browser::DockSetBadgeText, browser));
+  dict.SetMethod("dockGetBadgeText",
+                 base::Bind(&Browser::DockGetBadgeText, browser));
+  dict.SetMethod("dockHide", base::Bind(&Browser::DockHide, browser));
+  dict.SetMethod("dockShow", base::Bind(&Browser::DockShow, browser));
+  dict.SetMethod("dockSetMenu", &DockSetMenu);
+#endif
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_app, Initialize)

atom/browser/api/atom_api_app.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_API_ATOM_API_APP_H_
@@ -7,54 +7,60 @@
 
 #include <string>
 
-#include "base/compiler_specific.h"
+#include "atom/browser/api/event_emitter.h"
 #include "atom/browser/browser_observer.h"
-#include "atom/common/api/atom_api_event_emitter.h"
+#include "base/callback.h"
+#include "native_mate/handle.h"
+
+class GURL;
+
+namespace base {
+class FilePath;
+}
+
+namespace mate {
+class Arguments;
+}
 
 namespace atom {
 
 namespace api {
 
-class App : public EventEmitter,
+class App : public mate::EventEmitter,
             public BrowserObserver {
  public:
-  virtual ~App();
+  typedef base::Callback<void(std::string)> ResolveProxyCallback;
 
-  static void Initialize(v8::Handle<v8::Object> target);
+  static mate::Handle<App> Create(v8::Isolate* isolate);
 
  protected:
-  explicit App(v8::Handle<v8::Object> wrapper);
+  App();
+  virtual ~App();
 
-  // BrowserObserver implementations:
-  virtual void OnWillQuit(bool* prevent_default) OVERRIDE;
-  virtual void OnWindowAllClosed() OVERRIDE;
-  virtual void OnOpenFile(bool* prevent_default,
-                          const std::string& file_path) OVERRIDE;
-  virtual void OnOpenURL(const std::string& url) OVERRIDE;
-  virtual void OnActivateWithNoOpenWindows() OVERRIDE;
-  virtual void OnWillFinishLaunching() OVERRIDE;
-  virtual void OnFinishLaunching() OVERRIDE;
+  // BrowserObserver:
+  void OnBeforeQuit(bool* prevent_default) override;
+  void OnWillQuit(bool* prevent_default) override;
+  void OnWindowAllClosed() override;
+  void OnQuit() override;
+  void OnOpenFile(bool* prevent_default, const std::string& file_path) override;
+  void OnOpenURL(const std::string& url) override;
+  void OnActivateWithNoOpenWindows() override;
+  void OnWillFinishLaunching() override;
+  void OnFinishLaunching() override;
+
+  // mate::Wrappable:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
 
  private:
-  static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
+  // Get/Set the pre-defined path in PathService.
+  base::FilePath GetPath(mate::Arguments* args, const std::string& name);
+  void SetPath(mate::Arguments* args,
+               const std::string& name,
+               const base::FilePath& path);
 
-  static void Quit(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Exit(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Terminate(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Focus(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetVersion(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetVersion(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetName(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetName(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void AppendSwitch(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void AppendArgument(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-#if defined(OS_MACOSX)
-  static void DockBounce(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void DockCancelBounce(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void DockSetBadgeText(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void DockGetBadgeText(const v8::FunctionCallbackInfo<v8::Value>& args);
-#endif  // defined(OS_MACOSX)
+  void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
+  void SetDesktopName(const std::string& desktop_name);
 
   DISALLOW_COPY_AND_ASSIGN(App);
 };

atom/browser/api/atom_api_auto_updater.cc

@@ -1,22 +1,22 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/api/atom_api_auto_updater.h"
 
 #include "base/time/time.h"
-#include "base/values.h"
 #include "atom/browser/auto_updater.h"
-#include "atom/common/v8/native_type_conversions.h"
+#include "atom/browser/browser.h"
+#include "native_mate/dictionary.h"
+#include "native_mate/object_template_builder.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
 namespace api {
 
-AutoUpdater::AutoUpdater(v8::Handle<v8::Object> wrapper)
-    : EventEmitter(wrapper) {
+AutoUpdater::AutoUpdater() {
   auto_updater::AutoUpdater::SetDelegate(this);
 }
 
@@ -25,9 +25,7 @@ AutoUpdater::~AutoUpdater() {
 }
 
 void AutoUpdater::OnError(const std::string& error) {
-  base::ListValue args;
-  args.AppendString(error);
-  Emit("error", &args);
+  Emit("error", error);
 }
 
 void AutoUpdater::OnCheckingForUpdate() {
@@ -48,59 +46,44 @@ void AutoUpdater::OnUpdateDownloaded(const std::string& release_notes,
                                      const std::string& update_url,
                                      const base::Closure& quit_and_install) {
   quit_and_install_ = quit_and_install;
+  Emit("update-downloaded-raw", release_notes, release_name,
+       release_date.ToJsTime(), update_url);
+}
 
-  base::ListValue args;
-  args.AppendString(release_notes);
-  args.AppendString(release_name);
-  args.AppendDouble(release_date.ToJsTime());
-  args.AppendString(update_url);
-  Emit("update-downloaded-raw", &args);
+mate::ObjectTemplateBuilder AutoUpdater::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return mate::ObjectTemplateBuilder(isolate)
+      .SetMethod("setFeedUrl", &auto_updater::AutoUpdater::SetFeedURL)
+      .SetMethod("checkForUpdates", &auto_updater::AutoUpdater::CheckForUpdates)
+      .SetMethod("_quitAndInstall", &AutoUpdater::QuitAndInstall);
+}
+
+void AutoUpdater::QuitAndInstall() {
+  if (quit_and_install_.is_null())
+    Browser::Get()->Shutdown();
+  else
+    quit_and_install_.Run();
 }
 
 // static
-void AutoUpdater::New(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  if (!args.IsConstructCall())
-    return node::ThrowError("Require constructor call");
-
-  new AutoUpdater(args.This());
-}
-
-// static
-void AutoUpdater::SetFeedURL(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  auto_updater::AutoUpdater::SetFeedURL(FromV8Value(args[0]));
-}
-
-// static
-void AutoUpdater::CheckForUpdates(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  auto_updater::AutoUpdater::CheckForUpdates();
-}
-
-// static
-void AutoUpdater::QuitAndInstall(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  AutoUpdater* self = AutoUpdater::Unwrap<AutoUpdater>(args.This());
-
-  if (!self->quit_and_install_.is_null())
-    self->quit_and_install_.Run();
-}
-
-// static
-void AutoUpdater::Initialize(v8::Handle<v8::Object> target) {
-  v8::Local<v8::FunctionTemplate> t(
-      v8::FunctionTemplate::New(AutoUpdater::New));
-  t->InstanceTemplate()->SetInternalFieldCount(1);
-  t->SetClassName(v8::String::NewSymbol("AutoUpdater"));
-
-  NODE_SET_PROTOTYPE_METHOD(t, "setFeedUrl", SetFeedURL);
-  NODE_SET_PROTOTYPE_METHOD(t, "checkForUpdates", CheckForUpdates);
-  NODE_SET_PROTOTYPE_METHOD(t, "quitAndInstall", QuitAndInstall);
-
-  target->Set(v8::String::NewSymbol("AutoUpdater"), t->GetFunction());
+mate::Handle<AutoUpdater> AutoUpdater::Create(v8::Isolate* isolate) {
+  return CreateHandle(isolate, new AutoUpdater);
 }
 
 }  // namespace api
 
 }  // namespace atom
 
-NODE_MODULE(atom_browser_auto_updater, atom::api::AutoUpdater::Initialize)
+
+namespace {
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  v8::Isolate* isolate = context->GetIsolate();
+  mate::Dictionary dict(isolate, exports);
+  dict.Set("autoUpdater", atom::api::AutoUpdater::Create(isolate));
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_auto_updater, Initialize)

atom/browser/api/atom_api_auto_updater.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
@@ -8,44 +8,41 @@
 #include <string>
 
 #include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
+#include "atom/browser/api/event_emitter.h"
 #include "atom/browser/auto_updater_delegate.h"
-#include "atom/common/api/atom_api_event_emitter.h"
+#include "native_mate/handle.h"
 
 namespace atom {
 
 namespace api {
 
-class AutoUpdater : public EventEmitter,
+class AutoUpdater : public mate::EventEmitter,
                     public auto_updater::AutoUpdaterDelegate {
  public:
-  virtual ~AutoUpdater();
-
-  static void Initialize(v8::Handle<v8::Object> target);
+  static mate::Handle<AutoUpdater> Create(v8::Isolate* isolate);
 
  protected:
-  explicit AutoUpdater(v8::Handle<v8::Object> wrapper);
+  AutoUpdater();
+  virtual ~AutoUpdater();
 
   // AutoUpdaterDelegate implementations.
-  virtual void OnError(const std::string& error) OVERRIDE;
-  virtual void OnCheckingForUpdate() OVERRIDE;
-  virtual void OnUpdateAvailable() OVERRIDE;
-  virtual void OnUpdateNotAvailable() OVERRIDE;
-  virtual void OnUpdateDownloaded(
+  void OnError(const std::string& error) override;
+  void OnCheckingForUpdate() override;
+  void OnUpdateAvailable() override;
+  void OnUpdateNotAvailable() override;
+  void OnUpdateDownloaded(
       const std::string& release_notes,
       const std::string& release_name,
       const base::Time& release_date,
       const std::string& update_url,
-      const base::Closure& quit_and_install) OVERRIDE;
+      const base::Closure& quit_and_install) override;
+
+  // mate::Wrappable implementations:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
 
  private:
-  static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  static void SetFeedURL(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void CheckForUpdates(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  static void ContinueUpdate(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void QuitAndInstall(const v8::FunctionCallbackInfo<v8::Value>& args);
+  void QuitAndInstall();
 
   base::Closure quit_and_install_;
 

atom/browser/api/atom_api_browser_ipc.cc

@@ -1,48 +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 "atom/browser/api/atom_api_browser_ipc.h"
-
-#include "atom/common/api/api_messages.h"
-#include "atom/common/v8/node_common.h"
-#include "atom/common/v8/native_type_conversions.h"
-#include "content/public/browser/render_view_host.h"
-
-using content::RenderViewHost;
-
-namespace atom {
-
-namespace api {
-
-// static
-void BrowserIPC::Send(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  string16 channel;
-  int process_id, routing_id;
-  scoped_ptr<base::Value> arguments;
-  if (!FromV8Arguments(args, &channel, &process_id, &routing_id, &arguments))
-    return node::ThrowTypeError("Bad argument");
-
-  DCHECK(arguments && arguments->IsType(base::Value::TYPE_LIST));
-
-  RenderViewHost* render_view_host(RenderViewHost::FromID(
-      process_id, routing_id));
-  if (!render_view_host)
-    return node::ThrowError("Invalid render view host");
-
-  args.GetReturnValue().Set(render_view_host->Send(new AtomViewMsg_Message(
-      routing_id,
-      channel,
-      *static_cast<base::ListValue*>(arguments.get()))));
-}
-
-// static
-void BrowserIPC::Initialize(v8::Handle<v8::Object> target) {
-  NODE_SET_METHOD(target, "send", Send);
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-NODE_MODULE(atom_browser_ipc, atom::api::BrowserIPC::Initialize)

atom/browser/api/atom_api_browser_ipc.h

@@ -1,29 +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.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_BROWSER_IPC_H_
-#define ATOM_BROWSER_API_ATOM_API_BROWSER_IPC_H_
-
-#include "base/basictypes.h"
-#include "v8/include/v8.h"
-
-namespace atom {
-
-namespace api {
-
-class BrowserIPC {
- public:
-  static void Initialize(v8::Handle<v8::Object> target);
-
- private:
-  static void Send(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(BrowserIPC);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_BROWSER_IPC_H_

atom/browser/api/atom_api_content_tracing.cc

@@ -0,0 +1,94 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include <set>
+#include <string>
+
+#include "atom/common/native_mate_converters/file_path_converter.h"
+#include "base/bind.h"
+#include "content/public/browser/tracing_controller.h"
+#include "native_mate/callback.h"
+#include "native_mate/dictionary.h"
+
+#include "atom/common/node_includes.h"
+
+using content::TracingController;
+
+namespace mate {
+
+template<typename T>
+struct Converter<std::set<T> > {
+  static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
+                                    const std::set<T>& val) {
+    v8::Handle<v8::Array> result = v8::Array::New(
+        isolate, static_cast<int>(val.size()));
+    typename std::set<T>::const_iterator it;
+    int i;
+    for (i = 0, it = val.begin(); it != val.end(); ++it, ++i)
+      result->Set(i, Converter<T>::ToV8(isolate, *it));
+    return result;
+  }
+};
+
+template<>
+struct Converter<base::debug::CategoryFilter> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Handle<v8::Value> val,
+                     base::debug::CategoryFilter* out) {
+    std::string filter;
+    if (!ConvertFromV8(isolate, val, &filter))
+      return false;
+    *out = base::debug::CategoryFilter(filter);
+    return true;
+  }
+};
+
+template<>
+struct Converter<base::debug::TraceOptions> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Handle<v8::Value> val,
+                     base::debug::TraceOptions* out) {
+    std::string options;
+    if (!ConvertFromV8(isolate, val, &options))
+      return false;
+    return out->SetFromString(options);
+  }
+};
+
+}  // namespace mate
+
+namespace {
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  TracingController* controller = TracingController::GetInstance();
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("getCategories", base::Bind(
+      &TracingController::GetCategories, base::Unretained(controller)));
+  dict.SetMethod("startRecording", base::Bind(
+      &TracingController::EnableRecording, base::Unretained(controller)));
+  dict.SetMethod("stopRecording", base::Bind(
+      &TracingController::DisableRecording,
+      base::Unretained(controller),
+      nullptr));
+  dict.SetMethod("startMonitoring", base::Bind(
+      &TracingController::EnableMonitoring, base::Unretained(controller)));
+  dict.SetMethod("stopMonitoring", base::Bind(
+      &TracingController::DisableMonitoring, base::Unretained(controller)));
+  dict.SetMethod("captureMonitoringSnapshot", base::Bind(
+      &TracingController::CaptureMonitoringSnapshot,
+      base::Unretained(controller),
+      nullptr));
+  dict.SetMethod("getTraceBufferPercentFull", base::Bind(
+      &TracingController::GetTraceBufferPercentFull,
+      base::Unretained(controller)));
+  dict.SetMethod("setWatchEvent", base::Bind(
+      &TracingController::SetWatchEvent, base::Unretained(controller)));
+  dict.SetMethod("cancelWatchEvent", base::Bind(
+      &TracingController::CancelWatchEvent, base::Unretained(controller)));
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_content_tracing, Initialize)

atom/browser/api/atom_api_dialog.cc

@@ -1,144 +1,120 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/api/atom_api_dialog.h"
-
 #include <string>
+#include <utility>
 #include <vector>
 
-#include "base/bind.h"
+#include "atom/browser/api/atom_api_window.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/ui/file_dialog.h"
 #include "atom/browser/ui/message_box.h"
-#include "atom/common/v8/node_common.h"
-#include "atom/common/v8/native_type_conversions.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/native_mate_converters/image_converter.h"
+#include "native_mate/callback.h"
+#include "native_mate/dictionary.h"
 
-namespace atom {
+#include "atom/common/node_includes.h"
 
-namespace api {
+namespace mate {
+
+template<>
+struct Converter<file_dialog::Filter> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Handle<v8::Value> val,
+                     file_dialog::Filter* out) {
+    mate::Dictionary dict;
+    if (!ConvertFromV8(isolate, val, &dict))
+      return false;
+    if (!dict.Get("name", &(out->first)))
+      return false;
+    if (!dict.Get("extensions", &(out->second)))
+      return false;
+    return true;
+  }
+};
+
+}  // namespace mate
 
 namespace {
 
-template<typename T>
-void CallV8Function(const RefCountedV8Function& callback, T arg) {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
+void ShowMessageBox(int type,
+                    const std::vector<std::string>& buttons,
+                    const std::vector<std::string>& texts,
+                    const gfx::ImageSkia& icon,
+                    atom::NativeWindow* window,
+                    mate::Arguments* args) {
+  // FIXME We are exceeding the parameters limit of base::Bind here, so we have
+  // to pass some parameters in an array. We should remove this once we have
+  // variadic template support in base::Bind.
+  const std::string& title = texts[0];
+  const std::string& message = texts[1];
+  const std::string& detail = texts[2];
 
-  v8::Handle<v8::Value> value = ToV8Value(arg);
-  callback->NewHandle(node_isolate)->Call(
-      v8::Context::GetCurrent()->Global(), 1, &value);
+  v8::Handle<v8::Value> peek = args->PeekNext();
+  atom::MessageBoxCallback callback;
+  if (mate::Converter<atom::MessageBoxCallback>::FromV8(args->isolate(),
+                                                        peek,
+                                                        &callback)) {
+    atom::ShowMessageBox(window, (atom::MessageBoxType)type, buttons, title,
+                         message, detail, icon, callback);
+  } else {
+    int chosen = atom::ShowMessageBox(window, (atom::MessageBoxType)type,
+                                      buttons, title, message, detail, icon);
+    args->Return(chosen);
+  }
 }
 
-template<typename T>
-void CallV8Function2(const RefCountedV8Function& callback, bool result, T arg) {
-  if (result)
-    return CallV8Function<T>(callback, arg);
-  else
-    return CallV8Function<void*>(callback, NULL);
+void ShowOpenDialog(const std::string& title,
+                    const base::FilePath& default_path,
+                    const file_dialog::Filters& filters,
+                    int properties,
+                    atom::NativeWindow* window,
+                    mate::Arguments* args) {
+  v8::Handle<v8::Value> peek = args->PeekNext();
+  file_dialog::OpenDialogCallback callback;
+  if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(args->isolate(),
+                                                               peek,
+                                                               &callback)) {
+    file_dialog::ShowOpenDialog(window, title, default_path, filters,
+                                properties, callback);
+  } else {
+    std::vector<base::FilePath> paths;
+    if (file_dialog::ShowOpenDialog(window, title, default_path, filters,
+                                    properties, &paths))
+      args->Return(paths);
+  }
 }
 
-void Initialize(v8::Handle<v8::Object> target) {
-  NODE_SET_METHOD(target, "showMessageBox", ShowMessageBox);
-  NODE_SET_METHOD(target, "showOpenDialog", ShowOpenDialog);
-  NODE_SET_METHOD(target, "showSaveDialog", ShowSaveDialog);
+void ShowSaveDialog(const std::string& title,
+                    const base::FilePath& default_path,
+                    const file_dialog::Filters& filters,
+                    atom::NativeWindow* window,
+                    mate::Arguments* args) {
+  v8::Handle<v8::Value> peek = args->PeekNext();
+  file_dialog::SaveDialogCallback callback;
+  if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(args->isolate(),
+                                                               peek,
+                                                               &callback)) {
+    file_dialog::ShowSaveDialog(window, title, default_path, filters, callback);
+  } else {
+    base::FilePath path;
+    if (file_dialog::ShowSaveDialog(window, title, default_path, filters,
+                                    &path))
+      args->Return(path);
+  }
+}
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("showMessageBox", &ShowMessageBox);
+  dict.SetMethod("showErrorBox", &atom::ShowErrorBox);
+  dict.SetMethod("showOpenDialog", &ShowOpenDialog);
+  dict.SetMethod("showSaveDialog", &ShowSaveDialog);
 }
 
 }  // namespace
 
-void ShowMessageBox(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  int type;
-  std::vector<std::string> buttons;
-  std::string title, message, detail;
-  if (!FromV8Arguments(args, &type, &buttons, &title, &message, &detail))
-    return node::ThrowTypeError("Bad argument");
-
-  NativeWindow* native_window = FromV8Value(args[5]);
-
-  if (!args[6]->IsFunction()) {
-    int chosen = atom::ShowMessageBox(
-        native_window,
-        (MessageBoxType)type,
-        buttons,
-        title,
-        message,
-        detail);
-    args.GetReturnValue().Set(chosen);
-  } else {
-    RefCountedV8Function callback = FromV8Value(args[6]);
-    atom::ShowMessageBox(
-        native_window,
-        (MessageBoxType)type,
-        buttons,
-        title,
-        message,
-        detail,
-        base::Bind(&CallV8Function<int>, callback));
-  }
-}
-
-void ShowOpenDialog(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string title;
-  base::FilePath default_path;
-  int properties;
-  if (!FromV8Arguments(args, &title, &default_path, &properties))
-    return node::ThrowTypeError("Bad argument");
-
-  NativeWindow* native_window = FromV8Value(args[3]);
-
-  if (!args[4]->IsFunction()) {
-    std::vector<base::FilePath> paths;
-    if (!file_dialog::ShowOpenDialog(native_window,
-                                     title,
-                                     default_path,
-                                     properties,
-                                     &paths))
-      return;
-
-    v8::Handle<v8::Array> result = v8::Array::New(paths.size());
-    for (size_t i = 0; i < paths.size(); ++i)
-      result->Set(i, ToV8Value(paths[i]));
-
-    args.GetReturnValue().Set(result);
-  } else {
-    RefCountedV8Function callback = FromV8Value(args[4]);
-    file_dialog::ShowOpenDialog(
-        native_window,
-        title,
-        default_path,
-        properties,
-        base::Bind(&CallV8Function2<const std::vector<base::FilePath>&>,
-                   callback));
-  }
-}
-
-void ShowSaveDialog(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string title;
-  base::FilePath default_path;
-  if (!FromV8Arguments(args, &title, &default_path))
-    return node::ThrowTypeError("Bad argument");
-
-  NativeWindow* native_window = FromV8Value(args[2]);
-
-  if (!args[3]->IsFunction()) {
-    base::FilePath path;
-    if (file_dialog::ShowSaveDialog(native_window,
-                                    title,
-                                    default_path,
-                                    &path))
-      args.GetReturnValue().Set(ToV8Value(path));
-  } else {
-    RefCountedV8Function callback = FromV8Value(args[3]);
-    file_dialog::ShowSaveDialog(
-        native_window,
-        title,
-        default_path,
-        base::Bind(&CallV8Function2<const base::FilePath&>, callback));
-  }
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-NODE_MODULE(atom_browser_dialog, atom::api::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_dialog, Initialize)

atom/browser/api/atom_api_dialog.h

@@ -1,22 +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.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_DIALOG_H_
-#define ATOM_BROWSER_API_ATOM_API_DIALOG_H_
-
-#include "v8/include/v8.h"
-
-namespace atom {
-
-namespace api {
-
-void ShowMessageBox(const v8::FunctionCallbackInfo<v8::Value>& args);
-void ShowOpenDialog(const v8::FunctionCallbackInfo<v8::Value>& args);
-void ShowSaveDialog(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_DIALOG_H_

atom/browser/api/atom_api_event.cc

@@ -1,100 +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 "atom/browser/api/atom_api_event.h"
-
-#include "atom/browser/native_window.h"
-#include "atom/common/api/api_messages.h"
-#include "atom/common/v8/node_common.h"
-#include "atom/common/v8/native_type_conversions.h"
-
-namespace atom {
-
-namespace api {
-
-ScopedPersistent<v8::Function> Event::constructor_template_;
-
-Event::Event()
-    : sender_(NULL),
-      message_(NULL),
-      prevent_default_(false) {
-}
-
-Event::~Event() {
-  if (sender_ != NULL)
-    sender_->RemoveObserver(this);
-}
-
-// static
-v8::Handle<v8::Object> Event::CreateV8Object() {
-  if (constructor_template_.IsEmpty()) {
-    v8::Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(New);
-    t->InstanceTemplate()->SetInternalFieldCount(1);
-    t->SetClassName(v8::String::NewSymbol("Event"));
-
-    NODE_SET_PROTOTYPE_METHOD(t, "preventDefault", PreventDefault);
-    NODE_SET_PROTOTYPE_METHOD(t, "sendReply", SendReply);
-    NODE_SET_PROTOTYPE_METHOD(t, "destroy", Destroy);
-
-    constructor_template_.reset(t->GetFunction());
-  }
-
-  v8::Handle<v8::Function> t = constructor_template_.NewHandle(node_isolate);
-  return t->NewInstance(0, NULL);
-}
-
-void Event::SetSenderAndMessage(NativeWindow* sender, IPC::Message* message) {
-  DCHECK(!sender_);
-  DCHECK(!message_);
-  sender_ = sender;
-  message_ = message;
-
-  sender_->AddObserver(this);
-}
-
-void Event::OnWindowClosed() {
-  sender_ = NULL;
-  message_ = NULL;
-}
-
-// static
-void Event::New(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  Event* event = new Event;
-  event->Wrap(args.This());
-}
-
-// static
-void Event::PreventDefault(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  Event* event = Unwrap<Event>(args.This());
-  if (event == NULL)
-    return node::ThrowError("Event is already destroyed");
-
-  event->prevent_default_ = true;
-}
-
-// static
-void Event::SendReply(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  Event* event = Unwrap<Event>(args.This());
-  if (event == NULL)
-    return node::ThrowError("Event is already destroyed");
-
-  if (event->message_ == NULL || event->sender_ == NULL)
-    return node::ThrowError("Can only send reply to synchronous events");
-
-  string16 json = FromV8Value(args[0]);
-
-  AtomViewHostMsg_Message_Sync::WriteReplyParams(event->message_, json);
-  event->sender_->Send(event->message_);
-
-  delete event;
-}
-
-// static
-void Event::Destroy(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  delete Unwrap<Event>(args.This());
-}
-
-}  // namespace api
-
-}  // namespace atom

atom/browser/api/atom_api_event.h

@@ -1,67 +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.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_EVENT_H_
-#define ATOM_BROWSER_API_ATOM_API_EVENT_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/strings/string16.h"
-#include "atom/browser/native_window_observer.h"
-#include "atom/common/v8/scoped_persistent.h"
-#include "vendor/node/src/node_object_wrap.h"
-
-namespace IPC {
-class Message;
-}
-
-namespace atom {
-
-class NativeWindow;
-
-namespace api {
-
-class Event : public node::ObjectWrap,
-              public NativeWindowObserver {
- public:
-  virtual ~Event();
-
-  // Create a V8 Event object.
-  static v8::Handle<v8::Object> CreateV8Object();
-
-  // Pass the sender and message to be replied.
-  void SetSenderAndMessage(NativeWindow* sender, IPC::Message* message);
-
-  // Whether event.preventDefault() is called.
-  bool prevent_default() const { return prevent_default_; }
-
- protected:
-  Event();
-
-  // NativeWindowObserver implementations:
-  virtual void OnWindowClosed() OVERRIDE;
-
- private:
-  static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  static void PreventDefault(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SendReply(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Destroy(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  static ScopedPersistent<v8::Function> constructor_template_;
-
-  // Replyer for the synchronous messages.
-  NativeWindow* sender_;
-  IPC::Message* message_;
-
-  bool prevent_default_;
-
-  DISALLOW_COPY_AND_ASSIGN(Event);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_EVENT_H_

atom/browser/api/atom_api_global_shortcut.cc

@@ -0,0 +1,98 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/api/atom_api_global_shortcut.h"
+
+#include <string>
+
+#include "atom/common/native_mate_converters/accelerator_converter.h"
+#include "base/stl_util.h"
+#include "native_mate/callback.h"
+#include "native_mate/dictionary.h"
+
+#include "atom/common/node_includes.h"
+
+using extensions::GlobalShortcutListener;
+
+namespace atom {
+
+namespace api {
+
+GlobalShortcut::GlobalShortcut() {
+}
+
+GlobalShortcut::~GlobalShortcut() {
+  UnregisterAll();
+}
+
+void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
+  if (accelerator_callback_map_.find(accelerator) ==
+      accelerator_callback_map_.end()) {
+    // This should never occur, because if it does, GlobalGlobalShortcutListener
+    // notifes us with wrong accelerator.
+    NOTREACHED();
+    return;
+  }
+  accelerator_callback_map_[accelerator].Run();
+}
+
+bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
+                              const base::Closure& callback) {
+  if (!GlobalShortcutListener::GetInstance()->RegisterAccelerator(
+      accelerator, this)) {
+    return false;
+  }
+
+  accelerator_callback_map_[accelerator] = callback;
+  return true;
+}
+
+void GlobalShortcut::Unregister(const ui::Accelerator& accelerator) {
+  if (!ContainsKey(accelerator_callback_map_, accelerator))
+    return;
+
+  accelerator_callback_map_.erase(accelerator);
+  GlobalShortcutListener::GetInstance()->UnregisterAccelerator(
+      accelerator, this);
+}
+
+bool GlobalShortcut::IsRegistered(const ui::Accelerator& accelerator) {
+  return ContainsKey(accelerator_callback_map_, accelerator);
+}
+
+void GlobalShortcut::UnregisterAll() {
+  accelerator_callback_map_.clear();
+  GlobalShortcutListener::GetInstance()->UnregisterAccelerators(this);
+}
+
+mate::ObjectTemplateBuilder GlobalShortcut::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return mate::ObjectTemplateBuilder(isolate)
+      .SetMethod("register", &GlobalShortcut::Register)
+      .SetMethod("isRegistered", &GlobalShortcut::IsRegistered)
+      .SetMethod("unregister", &GlobalShortcut::Unregister)
+      .SetMethod("unregisterAll", &GlobalShortcut::UnregisterAll);
+}
+
+// static
+mate::Handle<GlobalShortcut> GlobalShortcut::Create(v8::Isolate* isolate) {
+  return CreateHandle(isolate, new GlobalShortcut);
+}
+
+}  // namespace api
+
+}  // namespace atom
+
+namespace {
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  v8::Isolate* isolate = context->GetIsolate();
+  mate::Dictionary dict(isolate, exports);
+  dict.Set("globalShortcut", atom::api::GlobalShortcut::Create(isolate));
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_global_shortcut, Initialize)

atom/browser/api/atom_api_global_shortcut.h

@@ -0,0 +1,55 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
+#define ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
+
+#include <map>
+#include <string>
+
+#include "base/callback.h"
+#include "chrome/browser/extensions/global_shortcut_listener.h"
+#include "native_mate/wrappable.h"
+#include "native_mate/handle.h"
+#include "ui/base/accelerators/accelerator.h"
+
+namespace atom {
+
+namespace api {
+
+class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
+                       public mate::Wrappable {
+ public:
+  static mate::Handle<GlobalShortcut> Create(v8::Isolate* isolate);
+
+ protected:
+  GlobalShortcut();
+  virtual ~GlobalShortcut();
+
+  // mate::Wrappable implementations:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
+
+ private:
+  typedef std::map<ui::Accelerator, base::Closure> AcceleratorCallbackMap;
+
+  bool Register(const ui::Accelerator& accelerator,
+                const base::Closure& callback);
+  bool IsRegistered(const ui::Accelerator& accelerator);
+  void Unregister(const ui::Accelerator& accelerator);
+  void UnregisterAll();
+
+  // GlobalShortcutListener::Observer implementation.
+  void OnKeyPressed(const ui::Accelerator& accelerator) override;
+
+  AcceleratorCallbackMap accelerator_callback_map_;
+
+  DISALLOW_COPY_AND_ASSIGN(GlobalShortcut);
+};
+
+}  // namespace api
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_

atom/browser/api/atom_api_menu.cc

@@ -1,362 +1,200 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/api/atom_api_menu.h"
 
-#include <string>
+#include "atom/browser/native_window.h"
+#include "atom/common/native_mate_converters/accelerator_converter.h"
+#include "atom/common/native_mate_converters/image_converter.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "native_mate/callback.h"
+#include "native_mate/constructor.h"
+#include "native_mate/dictionary.h"
+#include "native_mate/object_template_builder.h"
 
-#include "atom/browser/ui/accelerator_util.h"
-#include "atom/common/v8/node_common.h"
-#include "atom/common/v8/native_type_conversions.h"
-
-#define UNWRAP_MEMNU_AND_CHECK \
-  Menu* self = ObjectWrap::Unwrap<Menu>(args.This()); \
-  if (self == NULL) \
-    return node::ThrowError("Menu is already destroyed")
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
 namespace api {
 
-namespace {
-
-// Call method of delegate object.
-v8::Handle<v8::Value> CallDelegate(v8::Handle<v8::Value> default_value,
-                                   v8::Handle<v8::Object> menu,
-                                   const char* method,
-                                   int command_id) {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-
-  v8::Handle<v8::Value> delegate = menu->Get(v8::String::New("delegate"));
-  if (!delegate->IsObject())
-    return default_value;
-
-  v8::Handle<v8::Function> function = v8::Handle<v8::Function>::Cast(
-      delegate->ToObject()->Get(v8::String::New(method)));
-  if (!function->IsFunction())
-    return default_value;
-
-  v8::Handle<v8::Value> argv = v8::Integer::New(command_id);
-
-  return handle_scope.Close(
-      function->Call(v8::Context::GetCurrent()->Global(), 1, &argv));
-}
-
-}  // namespace
-
-Menu::Menu(v8::Handle<v8::Object> wrapper)
-    : EventEmitter(wrapper),
-      model_(new ui::SimpleMenuModel(this)) {
+Menu::Menu()
+    : model_(new ui::SimpleMenuModel(this)),
+      parent_(NULL) {
 }
 
 Menu::~Menu() {
 }
 
+void Menu::AfterInit(v8::Isolate* isolate) {
+  mate::Dictionary wrappable(isolate, GetWrapper(isolate));
+  mate::Dictionary delegate;
+  if (!wrappable.Get("delegate", &delegate))
+    return;
+
+  delegate.Get("isCommandIdChecked", &is_checked_);
+  delegate.Get("isCommandIdEnabled", &is_enabled_);
+  delegate.Get("isCommandIdVisible", &is_visible_);
+  delegate.Get("getAcceleratorForCommandId", &get_accelerator_);
+  delegate.Get("executeCommand", &execute_command_);
+  delegate.Get("menuWillShow", &menu_will_show_);
+}
+
 bool Menu::IsCommandIdChecked(int command_id) const {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-  return CallDelegate(v8::False(),
-                      const_cast<Menu*>(this)->handle(),
-                      "isCommandIdChecked",
-                      command_id)->BooleanValue();
+  return is_checked_.Run(command_id);
 }
 
 bool Menu::IsCommandIdEnabled(int command_id) const {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-  return CallDelegate(v8::True(),
-                      const_cast<Menu*>(this)->handle(),
-                      "isCommandIdEnabled",
-                      command_id)->BooleanValue();
+  return is_enabled_.Run(command_id);
 }
 
 bool Menu::IsCommandIdVisible(int command_id) const {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-  return CallDelegate(v8::True(),
-                      const_cast<Menu*>(this)->handle(),
-                      "isCommandIdVisible",
-                      command_id)->BooleanValue();
+  return is_visible_.Run(command_id);
 }
 
 bool Menu::GetAcceleratorForCommandId(int command_id,
                                       ui::Accelerator* accelerator) {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-  v8::Handle<v8::Value> shortcut = CallDelegate(v8::Undefined(),
-                                                handle(),
-                                                "getAcceleratorForCommandId",
-                                                command_id);
-  if (shortcut->IsString()) {
-    std::string shortcut_str = FromV8Value(shortcut);
-    return accelerator_util::StringToAccelerator(shortcut_str, accelerator);
-  }
-
-  return false;
-}
-
-bool Menu::IsItemForCommandIdDynamic(int command_id) const {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-  return CallDelegate(v8::False(),
-                      const_cast<Menu*>(this)->handle(),
-                      "isItemForCommandIdDynamic",
-                      command_id)->BooleanValue();
-}
-
-string16 Menu::GetLabelForCommandId(int command_id) const {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-  return FromV8Value(CallDelegate(v8::False(),
-                                  const_cast<Menu*>(this)->handle(),
-                                  "getLabelForCommandId",
-                                  command_id));
-}
-
-string16 Menu::GetSublabelForCommandId(int command_id) const {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-  return FromV8Value(CallDelegate(v8::False(),
-                                  const_cast<Menu*>(this)->handle(),
-                                  "getSubLabelForCommandId",
-                                  command_id));
+  v8::Isolate* isolate = v8::Isolate::GetCurrent();
+  v8::Locker locker(isolate);
+  v8::HandleScope handle_scope(isolate);
+  v8::Handle<v8::Value> val = get_accelerator_.Run(command_id);
+  return mate::ConvertFromV8(isolate, val, accelerator);
 }
 
 void Menu::ExecuteCommand(int command_id, int event_flags) {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-  CallDelegate(v8::False(), handle(), "executeCommand", command_id);
+  execute_command_.Run(command_id);
+}
+
+void Menu::MenuWillShow(ui::SimpleMenuModel* source) {
+  menu_will_show_.Run();
+}
+
+void Menu::AttachToWindow(Window* window) {
+  window->window()->SetMenu(model_.get());
+}
+
+void Menu::InsertItemAt(
+    int index, int command_id, const base::string16& label) {
+  model_->InsertItemAt(index, command_id, label);
+}
+
+void Menu::InsertSeparatorAt(int index) {
+  model_->InsertSeparatorAt(index, ui::NORMAL_SEPARATOR);
+}
+
+void Menu::InsertCheckItemAt(int index,
+                             int command_id,
+                             const base::string16& label) {
+  model_->InsertCheckItemAt(index, command_id, label);
+}
+
+void Menu::InsertRadioItemAt(int index,
+                             int command_id,
+                             const base::string16& label,
+                             int group_id) {
+  model_->InsertRadioItemAt(index, command_id, label, group_id);
+}
+
+void Menu::InsertSubMenuAt(int index,
+                           int command_id,
+                           const base::string16& label,
+                           Menu* menu) {
+  menu->parent_ = this;
+  model_->InsertSubMenuAt(index, command_id, label, menu->model_.get());
+}
+
+void Menu::SetIcon(int index, const gfx::Image& image) {
+  model_->SetIcon(index, image);
+}
+
+void Menu::SetSublabel(int index, const base::string16& sublabel) {
+  model_->SetSublabel(index, sublabel);
+}
+
+void Menu::Clear() {
+  model_->Clear();
+}
+
+int Menu::GetIndexOfCommandId(int command_id) {
+  return model_->GetIndexOfCommandId(command_id);
+}
+
+int Menu::GetItemCount() const {
+  return model_->GetItemCount();
+}
+
+int Menu::GetCommandIdAt(int index) const {
+  return model_->GetCommandIdAt(index);
+}
+
+base::string16 Menu::GetLabelAt(int index) const {
+  return model_->GetLabelAt(index);
+}
+
+base::string16 Menu::GetSublabelAt(int index) const {
+  return model_->GetSublabelAt(index);
+}
+
+bool Menu::IsItemCheckedAt(int index) const {
+  return model_->IsItemCheckedAt(index);
+}
+
+bool Menu::IsEnabledAt(int index) const {
+  return model_->IsEnabledAt(index);
+}
+
+bool Menu::IsVisibleAt(int index) const {
+  return model_->IsVisibleAt(index);
 }
 
 // static
-void Menu::New(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  if (!args.IsConstructCall())
-    return node::ThrowError("Require constructor call");
-
-  Menu::Create(args.This());
-}
-
-// static
-void Menu::InsertItem(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-
-  int index, command_id;
-  string16 label;
-  if (!FromV8Arguments(args, &index, &command_id, &label))
-    return node::ThrowTypeError("Bad argument");
-
-  if (index < 0)
-    self->model_->AddItem(command_id, label);
-  else
-    self->model_->InsertItemAt(index, command_id, label);
-}
-
-// static
-void Menu::InsertCheckItem(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-
-  int index, command_id;
-  string16 label;
-  if (!FromV8Arguments(args, &index, &command_id, &label))
-    return node::ThrowTypeError("Bad argument");
-
-  if (index < 0)
-    self->model_->AddCheckItem(command_id, label);
-  else
-    self->model_->InsertCheckItemAt(index, command_id, label);
-}
-
-// static
-void Menu::InsertRadioItem(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-
-  int index, command_id, group_id;
-  string16 label;
-  if (!FromV8Arguments(args, &index, &command_id, &label, &group_id))
-    return node::ThrowTypeError("Bad argument");
-
-  if (index < 0)
-    self->model_->AddRadioItem(command_id, label, group_id);
-  else
-    self->model_->InsertRadioItemAt(index, command_id, label, group_id);
-}
-
-// static
-void Menu::InsertSeparator(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-
-  int index;
-  if (!FromV8Arguments(args, &index))
-    return node::ThrowTypeError("Bad argument");
-
-  if (index < 0)
-    self->model_->AddSeparator(ui::NORMAL_SEPARATOR);
-  else
-    self->model_->InsertSeparatorAt(index, ui::NORMAL_SEPARATOR);
-}
-
-// static
-void Menu::InsertSubMenu(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-
-  int index, command_id;
-  string16 label;
-  if (!FromV8Arguments(args, &index, &command_id, &label))
-    return node::ThrowTypeError("Bad argument");
-
-  Menu* submenu = ObjectWrap::Unwrap<Menu>(args[3]->ToObject());
-  if (!submenu)
-    return node::ThrowTypeError("The submenu is already destroyed");
-
-  if (index < 0)
-    self->model_->AddSubMenu(command_id, label, submenu->model_.get());
-  else
-    self->model_->InsertSubMenuAt(
-        index, command_id, label, submenu->model_.get());
-}
-
-// static
-void Menu::SetIcon(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-
-  int index;
-  base::FilePath path;
-  if (!FromV8Arguments(args, &index, &path))
-    return node::ThrowTypeError("Bad argument");
-
-  // FIXME use webkit_glue's image decoder here.
-}
-
-// static
-void Menu::SetSublabel(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-
-  int index;
-  string16 label;
-  if (!FromV8Arguments(args, &index, &label))
-    return node::ThrowTypeError("Bad argument");
-
-  self->model_->SetSublabel(index, label);
-}
-
-// static
-void Menu::Clear(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-  self->model_->Clear();
-}
-
-// static
-void Menu::GetIndexOfCommandId(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-  int index = FromV8Value(args[0]);
-  args.GetReturnValue().Set(self->model_->GetIndexOfCommandId(index));
-}
-
-// static
-void Menu::GetItemCount(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-  args.GetReturnValue().Set(self->model_->GetItemCount());
-}
-
-// static
-void Menu::GetCommandIdAt(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-  int index = FromV8Value(args[0]);
-  args.GetReturnValue().Set(self->model_->GetCommandIdAt(index));
-}
-
-// static
-void Menu::GetLabelAt(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-  int index = FromV8Value(args[0]);
-  args.GetReturnValue().Set(ToV8Value(self->model_->GetLabelAt(index)));
-}
-
-// static
-void Menu::GetSublabelAt(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-  int index = FromV8Value(args[0]);
-  args.GetReturnValue().Set(ToV8Value(self->model_->GetSublabelAt(index)));
-}
-
-// static
-void Menu::IsItemCheckedAt(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-  int index = FromV8Value(args[0]);
-  args.GetReturnValue().Set(self->model_->IsItemCheckedAt(index));
-}
-
-// static
-void Menu::IsEnabledAt(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-  int index = FromV8Value(args[0]);
-  args.GetReturnValue().Set(self->model_->IsEnabledAt(index));
-}
-
-// static
-void Menu::IsVisibleAt(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-  int index = FromV8Value(args[0]);
-  args.GetReturnValue().Set(self->model_->IsVisibleAt(index));
-}
-
-// static
-void Menu::Popup(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  UNWRAP_MEMNU_AND_CHECK;
-
-  atom::NativeWindow* window;
-  if (!FromV8Arguments(args, &window))
-    return node::ThrowTypeError("Bad argument");
-
-  self->Popup(window);
-}
-
-// static
-void Menu::Initialize(v8::Handle<v8::Object> target) {
-  v8::Local<v8::FunctionTemplate> t(v8::FunctionTemplate::New(Menu::New));
-  t->InstanceTemplate()->SetInternalFieldCount(1);
-  t->SetClassName(v8::String::NewSymbol("Menu"));
-
-  NODE_SET_PROTOTYPE_METHOD(t, "insertItem", InsertItem);
-  NODE_SET_PROTOTYPE_METHOD(t, "insertCheckItem", InsertCheckItem);
-  NODE_SET_PROTOTYPE_METHOD(t, "insertRadioItem", InsertRadioItem);
-  NODE_SET_PROTOTYPE_METHOD(t, "insertSeparator", InsertSeparator);
-  NODE_SET_PROTOTYPE_METHOD(t, "insertSubMenu", InsertSubMenu);
-
-  NODE_SET_PROTOTYPE_METHOD(t, "setIcon", SetIcon);
-  NODE_SET_PROTOTYPE_METHOD(t, "setSublabel", SetSublabel);
-
-  NODE_SET_PROTOTYPE_METHOD(t, "clear", Clear);
-
-  NODE_SET_PROTOTYPE_METHOD(t, "getIndexOfCommandId", GetIndexOfCommandId);
-  NODE_SET_PROTOTYPE_METHOD(t, "getItemCount", GetItemCount);
-  NODE_SET_PROTOTYPE_METHOD(t, "getCommandIdAt", GetCommandIdAt);
-  NODE_SET_PROTOTYPE_METHOD(t, "getLabelAt", GetLabelAt);
-  NODE_SET_PROTOTYPE_METHOD(t, "getSublabelAt", GetSublabelAt);
-  NODE_SET_PROTOTYPE_METHOD(t, "isItemCheckedAt", IsItemCheckedAt);
-  NODE_SET_PROTOTYPE_METHOD(t, "isEnabledAt", IsEnabledAt);
-  NODE_SET_PROTOTYPE_METHOD(t, "isVisibleAt", IsVisibleAt);
-
-  NODE_SET_PROTOTYPE_METHOD(t, "popup", Popup);
-
-#if defined(OS_WIN) || defined(TOOLKIT_GTK)
-  NODE_SET_PROTOTYPE_METHOD(t, "attachToWindow", AttachToWindow);
-#endif
-
-  target->Set(v8::String::NewSymbol("Menu"), t->GetFunction());
-
-#if defined(OS_MACOSX)
-  NODE_SET_METHOD(target, "setApplicationMenu", SetApplicationMenu);
-  NODE_SET_METHOD(
-      target, "sendActionToFirstResponder", SendActionToFirstResponder);
-#endif
+void Menu::BuildPrototype(v8::Isolate* isolate,
+                          v8::Handle<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
+      .SetMethod("insertItem", &Menu::InsertItemAt)
+      .SetMethod("insertCheckItem", &Menu::InsertCheckItemAt)
+      .SetMethod("insertRadioItem", &Menu::InsertRadioItemAt)
+      .SetMethod("insertSeparator", &Menu::InsertSeparatorAt)
+      .SetMethod("insertSubMenu", &Menu::InsertSubMenuAt)
+      .SetMethod("setIcon", &Menu::SetIcon)
+      .SetMethod("setSublabel", &Menu::SetSublabel)
+      .SetMethod("clear", &Menu::Clear)
+      .SetMethod("getIndexOfCommandId", &Menu::GetIndexOfCommandId)
+      .SetMethod("getItemCount", &Menu::GetItemCount)
+      .SetMethod("getCommandIdAt", &Menu::GetCommandIdAt)
+      .SetMethod("getLabelAt", &Menu::GetLabelAt)
+      .SetMethod("getSublabelAt", &Menu::GetSublabelAt)
+      .SetMethod("isItemCheckedAt", &Menu::IsItemCheckedAt)
+      .SetMethod("isEnabledAt", &Menu::IsEnabledAt)
+      .SetMethod("isVisibleAt", &Menu::IsVisibleAt)
+      .SetMethod("attachToWindow", &Menu::AttachToWindow)
+      .SetMethod("_popup", &Menu::Popup)
+      .SetMethod("_popupAt", &Menu::PopupAt);
 }
 
 }  // namespace api
 
 }  // namespace atom
 
-NODE_MODULE(atom_browser_menu, atom::api::Menu::Initialize)
+
+namespace {
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  using atom::api::Menu;
+  v8::Isolate* isolate = context->GetIsolate();
+  v8::Local<v8::Function> constructor = mate::CreateConstructor<Menu>(
+      isolate, "Menu", base::Bind(&Menu::Create));
+  mate::Dictionary dict(isolate, exports);
+  dict.Set("Menu", static_cast<v8::Handle<v8::Value>>(constructor));
+#if defined(OS_MACOSX)
+  dict.SetMethod("setApplicationMenu", &Menu::SetApplicationMenu);
+  dict.SetMethod("sendActionToFirstResponder",
+                 &Menu::SendActionToFirstResponder);
+#endif
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_menu, Initialize)

atom/browser/api/atom_api_menu.h

@@ -1,82 +1,96 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_API_ATOM_API_MENU_H_
 #define ATOM_BROWSER_API_ATOM_API_MENU_H_
 
+#include <string>
+
+#include "atom/browser/api/atom_api_window.h"
+#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
-#include "atom/common/api/atom_api_event_emitter.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "native_mate/wrappable.h"
 
 namespace atom {
 
-class NativeWindow;
-
 namespace api {
 
-class Menu : public EventEmitter,
+class Menu : public mate::Wrappable,
              public ui::SimpleMenuModel::Delegate {
  public:
-  virtual ~Menu();
+  static mate::Wrappable* Create();
 
-  static Menu* Create(v8::Handle<v8::Object> wrapper);
+  static void BuildPrototype(v8::Isolate* isolate,
+                             v8::Handle<v8::ObjectTemplate> prototype);
 
-  static void Initialize(v8::Handle<v8::Object> target);
+#if defined(OS_MACOSX)
+  // Set the global menubar.
+  static void SetApplicationMenu(Menu* menu);
+
+  // Fake sending an action from the application menu.
+  static void SendActionToFirstResponder(const std::string& action);
+#endif
+
+  ui::SimpleMenuModel* model() const { return model_.get(); }
 
  protected:
-  explicit Menu(v8::Handle<v8::Object> wrapper);
+  Menu();
+  virtual ~Menu();
+
+  // mate::Wrappable:
+  void AfterInit(v8::Isolate* isolate) override;
 
   // ui::SimpleMenuModel::Delegate implementations:
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdVisible(int command_id) const OVERRIDE;
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
-  virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE;
-  virtual string16 GetSublabelForCommandId(int command_id) const OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+  bool IsCommandIdChecked(int command_id) const override;
+  bool IsCommandIdEnabled(int command_id) const override;
+  bool IsCommandIdVisible(int command_id) const override;
+  bool GetAcceleratorForCommandId(int command_id,
+                                  ui::Accelerator* accelerator) override;
+  void ExecuteCommand(int command_id, int event_flags) override;
+  void MenuWillShow(ui::SimpleMenuModel* source) override;
 
-  virtual void Popup(NativeWindow* window) = 0;
+  virtual void AttachToWindow(Window* window);
+  virtual void Popup(Window* window) = 0;
+  virtual void PopupAt(Window* window, int x, int y) = 0;
 
   scoped_ptr<ui::SimpleMenuModel> model_;
+  Menu* parent_;
 
  private:
-  static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
+  void InsertItemAt(int index, int command_id, const base::string16& label);
+  void InsertSeparatorAt(int index);
+  void InsertCheckItemAt(int index,
+                         int command_id,
+                         const base::string16& label);
+  void InsertRadioItemAt(int index,
+                         int command_id,
+                         const base::string16& label,
+                         int group_id);
+  void InsertSubMenuAt(int index,
+                       int command_id,
+                       const base::string16& label,
+                       Menu* menu);
+  void SetIcon(int index, const gfx::Image& image);
+  void SetSublabel(int index, const base::string16& sublabel);
+  void Clear();
+  int GetIndexOfCommandId(int command_id);
+  int GetItemCount() const;
+  int GetCommandIdAt(int index) const;
+  base::string16 GetLabelAt(int index) const;
+  base::string16 GetSublabelAt(int index) const;
+  bool IsItemCheckedAt(int index) const;
+  bool IsEnabledAt(int index) const;
+  bool IsVisibleAt(int index) const;
 
-  static void InsertItem(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void InsertCheckItem(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void InsertRadioItem(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void InsertSeparator(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void InsertSubMenu(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  static void SetIcon(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetSublabel(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  static void Clear(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  static void GetIndexOfCommandId(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetItemCount(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetCommandIdAt(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetLabelAt(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetSublabelAt(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsItemCheckedAt(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsEnabledAt(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsVisibleAt(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  static void Popup(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-#if defined(OS_WIN) || defined(TOOLKIT_GTK)
-  static void AttachToWindow(const v8::FunctionCallbackInfo<v8::Value>& args);
-#elif defined(OS_MACOSX)
-  static void SetApplicationMenu(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SendActionToFirstResponder(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
-#endif
+  // Stored delegate methods.
+  base::Callback<bool(int)> is_checked_;
+  base::Callback<bool(int)> is_enabled_;
+  base::Callback<bool(int)> is_visible_;
+  base::Callback<v8::Handle<v8::Value>(int)> get_accelerator_;
+  base::Callback<void(int)> execute_command_;
+  base::Callback<void()> menu_will_show_;
 
   DISALLOW_COPY_AND_ASSIGN(Menu);
 };

atom/browser/api/atom_api_menu_gtk.cc

@@ -1,64 +0,0 @@
-// Copyright (c) 2014 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 "atom/browser/api/atom_api_menu_gtk.h"
-
-#include "atom/browser/native_window_gtk.h"
-#include "atom/common/v8/native_type_conversions.h"
-#include "content/public/browser/render_widget_host_view.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/screen.h"
-
-#include "atom/common/v8/node_common.h"
-
-namespace atom {
-
-namespace api {
-
-MenuGtk::MenuGtk(v8::Handle<v8::Object> wrapper)
-    : Menu(wrapper) {
-}
-
-MenuGtk::~MenuGtk() {
-}
-
-void MenuGtk::Popup(NativeWindow* native_window) {
-  uint32_t triggering_event_time;
-  gfx::Point point;
-
-  GdkEventButton* event = native_window->GetWebContents()->
-      GetRenderWidgetHostView()->GetLastMouseDown();
-  if (event) {
-    triggering_event_time = event->time;
-    point = gfx::Point(event->x_root, event->y_root);
-  } else {
-    triggering_event_time = GDK_CURRENT_TIME;
-    point = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
-  }
-
-  menu_gtk_.reset(new ::MenuGtk(this, model_.get()));
-  menu_gtk_->PopupAsContext(point, triggering_event_time);
-}
-
-// static
-void Menu::AttachToWindow(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  Menu* self = ObjectWrap::Unwrap<Menu>(args.This());
-  if (self == NULL)
-    return node::ThrowError("Menu is already destroyed");
-
-  NativeWindow* native_window;
-  if (!FromV8Arguments(args, &native_window))
-    return node::ThrowTypeError("Bad argument");
-
-  static_cast<NativeWindowGtk*>(native_window)->SetMenu(self->model_.get());
-}
-
-// static
-Menu* Menu::Create(v8::Handle<v8::Object> wrapper) {
-  return new MenuGtk(wrapper);
-}
-
-}  // namespace api
-
-}  // namespace atom

atom/browser/api/atom_api_menu_gtk.h

@@ -1,34 +0,0 @@
-// Copyright (c) 2014 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.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_MENU_GTK_H_
-#define ATOM_BROWSER_API_ATOM_API_MENU_GTK_H_
-
-#include "atom/browser/api/atom_api_menu.h"
-#include "chrome/browser/ui/gtk/menu_gtk.h"
-
-namespace atom {
-
-namespace api {
-
-class MenuGtk : public Menu,
-                public ::MenuGtk::Delegate {
- public:
-  explicit MenuGtk(v8::Handle<v8::Object> wrapper);
-  virtual ~MenuGtk();
-
- protected:
-  virtual void Popup(NativeWindow* window) OVERRIDE;
-
- private:
-  scoped_ptr<::MenuGtk> menu_gtk_;
-
-  DISALLOW_COPY_AND_ASSIGN(MenuGtk);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_MENU_GTK_H_

atom/browser/api/atom_api_menu_mac.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
@@ -16,19 +16,17 @@ namespace atom {
 namespace api {
 
 class MenuMac : public Menu {
- public:
-  explicit MenuMac(v8::Handle<v8::Object> wrapper);
-  virtual ~MenuMac();
-
  protected:
-  virtual void Popup(NativeWindow* window) OVERRIDE;
+  MenuMac();
+
+  void Popup(Window* window) override;
+  void PopupAt(Window* window, int x, int y) override;
 
   base::scoped_nsobject<AtomMenuController> menu_controller_;
 
  private:
   friend class Menu;
 
-  // Fake sending an action from the application menu.
   static void SendActionToFirstResponder(const std::string& action);
 
   DISALLOW_COPY_AND_ASSIGN(MenuMac);

atom/browser/api/atom_api_menu_mac.mm

@@ -1,44 +1,44 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #import "atom/browser/api/atom_api_menu_mac.h"
 
+#include "atom/browser/native_window.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
-#include "atom/browser/native_window.h"
-#include "atom/common/v8/node_common.h"
-#include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
+
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
 namespace api {
 
-MenuMac::MenuMac(v8::Handle<v8::Object> wrapper)
-    : Menu(wrapper) {
+MenuMac::MenuMac() {
 }
 
-MenuMac::~MenuMac() {
-}
+void MenuMac::Popup(Window* window) {
+  NativeWindow* native_window = window->window();
+  if (!native_window)
+    return;
+  content::WebContents* web_contents = native_window->GetWebContents();
+  if (!web_contents)
+    return;
 
-void MenuMac::Popup(NativeWindow* native_window) {
+  NSWindow* nswindow = native_window->GetNativeWindow();
   base::scoped_nsobject<AtomMenuController> menu_controller(
       [[AtomMenuController alloc] initWithModel:model_.get()]);
 
-  NSWindow* window = native_window->GetNativeWindow();
-  content::WebContents* web_contents = native_window->GetWebContents();
-
   // Fake out a context menu event.
   NSEvent* currentEvent = [NSApp currentEvent];
-  NSPoint position = [window mouseLocationOutsideOfEventStream];
+  NSPoint position = [nswindow mouseLocationOutsideOfEventStream];
   NSTimeInterval eventTime = [currentEvent timestamp];
   NSEvent* clickEvent = [NSEvent mouseEventWithType:NSRightMouseDown
                                            location:position
                                       modifierFlags:NSRightMouseDownMask
                                           timestamp:eventTime
-                                       windowNumber:[window windowNumber]
+                                       windowNumber:[nswindow windowNumber]
                                             context:nil
                                         eventNumber:0
                                          clickCount:1
@@ -47,26 +47,31 @@ void MenuMac::Popup(NativeWindow* native_window) {
   // Show the menu.
   [NSMenu popUpContextMenu:[menu_controller menu]
                  withEvent:clickEvent
-                   forView:web_contents->GetView()->GetContentNativeView()];
+                   forView:web_contents->GetContentNativeView()];
+}
+
+void MenuMac::PopupAt(Window* window, int x, int y) {
+  NativeWindow* native_window = window->window();
+  if (!native_window)
+    return;
+  content::WebContents* web_contents = native_window->GetWebContents();
+  if (!web_contents)
+    return;
+
+  base::scoped_nsobject<AtomMenuController> menu_controller(
+      [[AtomMenuController alloc] initWithModel:model_.get()]);
+  NSMenu* menu = [menu_controller menu];
+  NSView* view = web_contents->GetContentNativeView();
+
+  // Show the menu.
+  [menu popUpMenuPositioningItem:[menu itemAtIndex:0]
+                      atLocation:NSMakePoint(x, [view frame].size.height - y)
+                          inView:view];
 }
 
 // static
-void MenuMac::SendActionToFirstResponder(const std::string& action) {
-  SEL selector = NSSelectorFromString(base::SysUTF8ToNSString(action));
-  [[NSApplication sharedApplication] sendAction:selector
-                                             to:nil
-                                           from:[NSApp mainMenu]];
-}
-
-// static
-void Menu::SetApplicationMenu(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  if (!args[0]->IsObject())
-    return node::ThrowTypeError("Bad argument");
-
-  MenuMac* menu = ObjectWrap::Unwrap<MenuMac>(args[0]->ToObject());
-  if (!menu)
-    return node::ThrowError("Menu is destroyed");
-
+void Menu::SetApplicationMenu(Menu* base_menu) {
+  MenuMac* menu = static_cast<MenuMac*>(base_menu);
   base::scoped_nsobject<AtomMenuController> menu_controller(
       [[AtomMenuController alloc] initWithModel:menu->model_.get()]);
   [NSApp setMainMenu:[menu_controller menu]];
@@ -76,18 +81,14 @@ void Menu::SetApplicationMenu(const v8::FunctionCallbackInfo<v8::Value>& args) {
 }
 
 // static
-void Menu::SendActionToFirstResponder(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string action;
-  if (!FromV8Arguments(args, &action))
-    return node::ThrowTypeError("Bad argument");
-
-  MenuMac::SendActionToFirstResponder(action);
+void Menu::SendActionToFirstResponder(const std::string& action) {
+  SEL selector = NSSelectorFromString(base::SysUTF8ToNSString(action));
+  [NSApp sendAction:selector to:nil from:[NSApp mainMenu]];
 }
 
 // static
-Menu* Menu::Create(v8::Handle<v8::Object> wrapper) {
-  return new MenuMac(wrapper);
+mate::Wrappable* Menu::Create() {
+  return new MenuMac();
 }
 
 }  // namespace api

atom/browser/api/atom_api_menu_views.cc

@@ -0,0 +1,57 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/api/atom_api_menu_views.h"
+
+#include "atom/browser/native_window_views.h"
+#include "content/public/browser/render_widget_host_view.h"
+#include "ui/gfx/screen.h"
+#include "ui/views/controls/menu/menu_runner.h"
+
+namespace atom {
+
+namespace api {
+
+MenuViews::MenuViews() {
+}
+
+void MenuViews::Popup(Window* window) {
+  PopupAtPoint(window, gfx::Screen::GetNativeScreen()->GetCursorScreenPoint());
+}
+
+void MenuViews::PopupAt(Window* window, int x, int y) {
+  NativeWindow* native_window = static_cast<NativeWindow*>(window->window());
+  if (!native_window)
+    return;
+  content::WebContents* web_contents = native_window->GetWebContents();
+  if (!web_contents)
+    return;
+  content::RenderWidgetHostView* view = web_contents->GetRenderWidgetHostView();
+  if (!view)
+    return;
+
+  gfx::Point origin = view->GetViewBounds().origin();
+  PopupAtPoint(window, gfx::Point(origin.x() + x, origin.y() + y));
+}
+
+void MenuViews::PopupAtPoint(Window* window, const gfx::Point& point) {
+  views::MenuRunner menu_runner(
+      model(),
+      views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS);
+  ignore_result(menu_runner.RunMenuAt(
+      static_cast<NativeWindowViews*>(window->window())->widget(),
+      NULL,
+      gfx::Rect(point, gfx::Size()),
+      views::MENU_ANCHOR_TOPLEFT,
+      ui::MENU_SOURCE_MOUSE));
+}
+
+// static
+mate::Wrappable* Menu::Create() {
+  return new MenuViews();
+}
+
+}  // namespace api
+
+}  // namespace atom

atom/browser/api/atom_api_menu_views.h

@@ -0,0 +1,33 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
+#define ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
+
+#include "atom/browser/api/atom_api_menu.h"
+#include "ui/gfx/screen.h"
+
+namespace atom {
+
+namespace api {
+
+class MenuViews : public Menu {
+ public:
+  MenuViews();
+
+ protected:
+  void Popup(Window* window) override;
+  void PopupAt(Window* window, int x, int y) override;
+
+ private:
+  void PopupAtPoint(Window* window, const gfx::Point& point);
+
+  DISALLOW_COPY_AND_ASSIGN(MenuViews);
+};
+
+}  // namespace api
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_

atom/browser/api/atom_api_menu_win.cc

@@ -1,52 +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 "atom/browser/api/atom_api_menu_win.h"
-
-#include "atom/browser/native_window_win.h"
-#include "atom/browser/ui/win/menu_2.h"
-#include "atom/common/v8/native_type_conversions.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/screen.h"
-
-#include "atom/common/v8/node_common.h"
-
-namespace atom {
-
-namespace api {
-
-MenuWin::MenuWin(v8::Handle<v8::Object> wrapper)
-    : Menu(wrapper) {
-}
-
-MenuWin::~MenuWin() {
-}
-
-void MenuWin::Popup(NativeWindow* native_window) {
-  gfx::Point cursor = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
-  menu_.reset(new atom::Menu2(model_.get()));
-  menu_->RunContextMenuAt(cursor);
-}
-
-// static
-void Menu::AttachToWindow(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  Menu* self = ObjectWrap::Unwrap<Menu>(args.This());
-  if (self == NULL)
-    return node::ThrowError("Menu is already destroyed");
-
-  NativeWindow* native_window;
-  if (!FromV8Arguments(args, &native_window))
-    return node::ThrowTypeError("Bad argument");
-
-  static_cast<NativeWindowWin*>(native_window)->SetMenu(self->model_.get());
-}
-
-// static
-Menu* Menu::Create(v8::Handle<v8::Object> wrapper) {
-  return new MenuWin(wrapper);
-}
-
-}  // namespace api
-
-}  // namespace atom

atom/browser/api/atom_api_menu_win.h

@@ -1,34 +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.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_MENU_WIN_H_
-#define ATOM_BROWSER_API_ATOM_API_MENU_WIN_H_
-
-#include "atom/browser/api/atom_api_menu.h"
-
-namespace atom {
-
-class Menu2;
-
-namespace api {
-
-class MenuWin : public Menu {
- public:
-  explicit MenuWin(v8::Handle<v8::Object> wrapper);
-  virtual ~MenuWin();
-
- protected:
-  virtual void Popup(NativeWindow* window) OVERRIDE;
-
- private:
-  scoped_ptr<atom::Menu2> menu_;
-
-  DISALLOW_COPY_AND_ASSIGN(MenuWin);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_MENU_WIN_H_

atom/browser/api/atom_api_power_monitor.cc

@@ -1,20 +1,20 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/api/atom_api_power_monitor.h"
 
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
+#include "native_mate/dictionary.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
 namespace api {
 
-PowerMonitor::PowerMonitor(v8::Handle<v8::Object> wrapper)
-    : EventEmitter(wrapper) {
+PowerMonitor::PowerMonitor() {
   base::PowerMonitor::Get()->AddObserver(this);
 }
 
@@ -38,30 +38,30 @@ void PowerMonitor::OnResume() {
 }
 
 // static
-void PowerMonitor::New(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  if (!args.IsConstructCall())
-    return node::ThrowError("Require constructor call");
-
-  new PowerMonitor(args.This());
+mate::Handle<PowerMonitor> PowerMonitor::Create(v8::Isolate* isolate) {
+  return CreateHandle(isolate, new PowerMonitor);
 }
 
-// static
-void PowerMonitor::Initialize(v8::Handle<v8::Object> target) {
-#if defined(OS_MACOSX)
-  base::PowerMonitorDeviceSource::AllocateSystemIOPorts();
-#endif
-
-  v8::Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(
-      PowerMonitor::New);
-  t->InstanceTemplate()->SetInternalFieldCount(1);
-  t->SetClassName(v8::String::NewSymbol("PowerMonitor"));
-
-  target->Set(v8::String::NewSymbol("PowerMonitor"), t->GetFunction());
-}
-
-
 }  // namespace api
 
 }  // namespace atom
 
-NODE_MODULE(atom_browser_power_monitor, atom::api::PowerMonitor::Initialize)
+
+namespace {
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+#if defined(OS_MACOSX)
+  base::PowerMonitorDeviceSource::AllocateSystemIOPorts();
+#endif
+
+  using atom::api::PowerMonitor;
+  v8::Isolate* isolate = context->GetIsolate();
+  mate::Handle<PowerMonitor> power_monitor = PowerMonitor::Create(isolate);
+  mate::Dictionary dict(isolate, exports);
+  dict.Set("powerMonitor", power_monitor);
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_power_monitor, Initialize)

atom/browser/api/atom_api_power_monitor.h

@@ -1,35 +1,34 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
 #define ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
 
+#include "atom/browser/api/event_emitter.h"
 #include "base/compiler_specific.h"
 #include "base/power_monitor/power_observer.h"
-#include "atom/common/api/atom_api_event_emitter.h"
+#include "native_mate/handle.h"
 
 namespace atom {
 
 namespace api {
 
-class PowerMonitor : public EventEmitter,
+class PowerMonitor : public mate::EventEmitter,
                      public base::PowerObserver {
  public:
-  virtual ~PowerMonitor();
-
-  static void Initialize(v8::Handle<v8::Object> target);
+  static mate::Handle<PowerMonitor> Create(v8::Isolate* isolate);
 
  protected:
-  explicit PowerMonitor(v8::Handle<v8::Object> wrapper);
+  PowerMonitor();
+  virtual ~PowerMonitor();
 
-  virtual void OnPowerStateChange(bool on_battery_power) OVERRIDE;
-  virtual void OnSuspend() OVERRIDE;
-  virtual void OnResume() OVERRIDE;
+  // base::PowerObserver implementations:
+  void OnPowerStateChange(bool on_battery_power) override;
+  void OnSuspend() override;
+  void OnResume() override;
 
  private:
-  static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
-
   DISALLOW_COPY_AND_ASSIGN(PowerMonitor);
 };
 

atom/browser/api/atom_api_protocol.cc

@@ -1,150 +1,118 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/api/atom_api_protocol.h"
 
-#include "base/stl_util.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/net/adapter_request_job.h"
-#include "atom/browser/net/atom_url_request_context_getter.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"
-#include "atom/common/v8/native_type_conversions.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
 #include "content/public/browser/browser_thread.h"
+#include "native_mate/callback.h"
+#include "native_mate/dictionary.h"
 #include "net/url_request/url_request_context.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
+
+using content::BrowserThread;
+
+namespace mate {
+
+template<>
+struct Converter<const net::URLRequest*> {
+  static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
+                                    const net::URLRequest* val) {
+    return mate::ObjectTemplateBuilder(isolate)
+        .SetValue("method", val->method())
+        .SetValue("url", val->url().spec())
+        .SetValue("referrer", val->referrer())
+        .Build()->NewInstance();
+  }
+};
+
+}  // namespace mate
+
 
 namespace atom {
 
 namespace api {
 
-typedef net::URLRequestJobFactory::ProtocolHandler ProtocolHandler;
-
 namespace {
 
-// The protocol module object.
-ScopedPersistent<v8::Object> g_protocol_object;
-
-// Registered protocol handlers.
-typedef std::map<std::string, RefCountedV8Function> HandlersMap;
-static HandlersMap g_handlers;
-
-static const char* kEarlyUseProtocolError = "This method can only be used"
-    "after the application has finished launching.";
-
-// Emit an event for the protocol module.
-void EmitEventInUI(const std::string& event, const std::string& parameter) {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-
-  v8::Handle<v8::Value> argv[] = {
-      ToV8Value(event),
-      ToV8Value(parameter),
-  };
-  node::MakeCallback(g_protocol_object.NewHandle(node_isolate),
-                     "emit", 2, argv);
-}
-
-// Convert the URLRequest object to V8 object.
-v8::Handle<v8::Object> ConvertURLRequestToV8Object(
-    const net::URLRequest* request) {
-  v8::Local<v8::Object> obj = v8::Object::New();
-  obj->Set(ToV8Value("method"), ToV8Value(request->method()));
-  obj->Set(ToV8Value("url"), ToV8Value(request->url().spec()));
-  obj->Set(ToV8Value("referrer"), ToV8Value(request->referrer()));
-  return obj;
-}
-
-// Get the job factory.
-AtomURLRequestJobFactory* GetRequestJobFactory() {
-  return AtomBrowserContext::Get()->url_request_context_getter()->job_factory();
-}
+typedef net::URLRequestJobFactory::ProtocolHandler ProtocolHandler;
 
 class CustomProtocolRequestJob : public AdapterRequestJob {
  public:
-  CustomProtocolRequestJob(ProtocolHandler* protocol_handler,
+  CustomProtocolRequestJob(Protocol* registry,
+                           ProtocolHandler* protocol_handler,
                            net::URLRequest* request,
                            net::NetworkDelegate* network_delegate)
-      : AdapterRequestJob(protocol_handler, request, network_delegate) {
+      : AdapterRequestJob(protocol_handler, request, network_delegate),
+        registry_(registry) {
   }
 
   // AdapterRequestJob:
-  virtual void GetJobTypeInUI() OVERRIDE {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  void GetJobTypeInUI() override {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-    v8::Locker locker(node_isolate);
-    v8::HandleScope handle_scope(node_isolate);
+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
+    v8::Locker locker(isolate);
+    v8::HandleScope handle_scope(isolate);
 
     // Call the JS handler.
-    v8::Handle<v8::Value> argv[] = {
-      ConvertURLRequestToV8Object(request()),
-    };
-    RefCountedV8Function callback = g_handlers[request()->url().scheme()];
-    v8::Handle<v8::Value> result = callback->NewHandle(node_isolate)->Call(
-        v8::Context::GetCurrent()->Global(), 1, argv);
+    Protocol::JsProtocolHandler callback =
+        registry_->GetProtocolHandler(request()->url().scheme());
+    v8::Handle<v8::Value> result = callback.Run(request());
 
     // Determine the type of the job we are going to create.
     if (result->IsString()) {
-      std::string data = FromV8Value(result);
-      content::BrowserThread::PostTask(
-          content::BrowserThread::IO,
-          FROM_HERE,
+      std::string data = mate::V8ToString(result);
+      BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
           base::Bind(&AdapterRequestJob::CreateStringJobAndStart,
-                     GetWeakPtr(),
-                     "text/plain",
-                     "UTF-8",
-                     data));
+                     GetWeakPtr(), "text/plain", "UTF-8", data));
       return;
     } else if (result->IsObject()) {
       v8::Handle<v8::Object> obj = result->ToObject();
-      std::string name = FromV8Value(obj->GetConstructorName());
+      mate::Dictionary dict(isolate, obj);
+      std::string name = mate::V8ToString(obj->GetConstructorName());
       if (name == "RequestStringJob") {
-        std::string mime_type = FromV8Value(obj->Get(
-            v8::String::New("mimeType")));
-        std::string charset = FromV8Value(obj->Get(v8::String::New("charset")));
-        std::string data = FromV8Value(obj->Get(v8::String::New("data")));
+        std::string mime_type, charset, data;
+        dict.Get("mimeType", &mime_type);
+        dict.Get("charset", &charset);
+        dict.Get("data", &data);
 
-        content::BrowserThread::PostTask(
-            content::BrowserThread::IO,
-            FROM_HERE,
+        BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
             base::Bind(&AdapterRequestJob::CreateStringJobAndStart,
-                       GetWeakPtr(),
-                       mime_type,
-                       charset,
-                       data));
+                       GetWeakPtr(), mime_type, charset, data));
         return;
       } else if (name == "RequestFileJob") {
-        base::FilePath path = FromV8Value(obj->Get(v8::String::New("path")));
+        base::FilePath path;
+        dict.Get("path", &path);
 
-        content::BrowserThread::PostTask(
-            content::BrowserThread::IO,
-            FROM_HERE,
+        BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
             base::Bind(&AdapterRequestJob::CreateFileJobAndStart,
-                       GetWeakPtr(),
-                       path));
+                       GetWeakPtr(), path));
         return;
       }
     }
 
     // Try the default protocol handler if we have.
     if (default_protocol_handler()) {
-      content::BrowserThread::PostTask(
-          content::BrowserThread::IO,
-          FROM_HERE,
+      BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
           base::Bind(&AdapterRequestJob::CreateJobFromProtocolHandlerAndStart,
                      GetWeakPtr()));
       return;
     }
 
     // Fallback to the not implemented error.
-    content::BrowserThread::PostTask(
-        content::BrowserThread::IO,
-        FROM_HERE,
+    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
         base::Bind(&AdapterRequestJob::CreateErrorJobAndStart,
-                   GetWeakPtr(),
-                   net::ERR_NOT_IMPLEMENTED));
+                   GetWeakPtr(), net::ERR_NOT_IMPLEMENTED));
   }
+
+ private:
+  Protocol* registry_;  // Weak, the Protocol class is expected to live forever.
 };
 
 // Always return the same CustomProtocolRequestJob for all requests, because
@@ -155,16 +123,16 @@ class CustomProtocolRequestJob : public AdapterRequestJob {
 // registered handler doesn't want to deal with the request.
 class CustomProtocolHandler : public ProtocolHandler {
  public:
-  explicit CustomProtocolHandler(ProtocolHandler* protocol_handler = NULL)
-      : protocol_handler_(protocol_handler) {
+  CustomProtocolHandler(api::Protocol* registry,
+                        ProtocolHandler* protocol_handler = NULL)
+      : registry_(registry), protocol_handler_(protocol_handler) {
   }
 
-  virtual net::URLRequestJob* MaybeCreateJob(
+  net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE {
-    return new CustomProtocolRequestJob(protocol_handler_.get(),
-                                        request,
-                                        network_delegate);
+      net::NetworkDelegate* network_delegate) const override {
+    return new CustomProtocolRequestJob(registry_, protocol_handler_.get(),
+                                        request, network_delegate);
   }
 
   ProtocolHandler* ReleaseDefaultProtocolHandler() {
@@ -174,6 +142,7 @@ class CustomProtocolHandler : public ProtocolHandler {
   ProtocolHandler* original_handler() { return protocol_handler_.get(); }
 
  private:
+  Protocol* registry_;  // Weak, the Protocol class is expected to live forever.
   scoped_ptr<ProtocolHandler> protocol_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
@@ -181,206 +150,182 @@ class CustomProtocolHandler : public ProtocolHandler {
 
 }  // namespace
 
-// static
-void Protocol::RegisterProtocol(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string scheme;
-  RefCountedV8Function callback;
-  if (!FromV8Arguments(args, &scheme, &callback))
-    return node::ThrowTypeError("Bad argument");
+Protocol::Protocol()
+    : job_factory_(AtomBrowserContext::Get()->job_factory()) {
+  CHECK(job_factory_);
+}
 
-  if (g_handlers.find(scheme) != g_handlers.end() ||
-      GetRequestJobFactory()->IsHandledProtocol(scheme))
+Protocol::JsProtocolHandler Protocol::GetProtocolHandler(
+    const std::string& scheme) {
+  return protocol_handlers_[scheme];
+}
+
+mate::ObjectTemplateBuilder Protocol::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return mate::ObjectTemplateBuilder(isolate)
+      .SetMethod("registerProtocol",
+                 base::Bind(&Protocol::RegisterProtocol,
+                            base::Unretained(this)))
+      .SetMethod("unregisterProtocol",
+                 base::Bind(&Protocol::UnregisterProtocol,
+                            base::Unretained(this)))
+      .SetMethod("isHandledProtocol",
+                 base::Bind(&Protocol::IsHandledProtocol,
+                            base::Unretained(this)))
+      .SetMethod("interceptProtocol",
+                 base::Bind(&Protocol::InterceptProtocol,
+                            base::Unretained(this)))
+      .SetMethod("uninterceptProtocol",
+                 base::Bind(&Protocol::UninterceptProtocol,
+                            base::Unretained(this)));
+}
+
+void Protocol::RegisterProtocol(const std::string& scheme,
+                                const JsProtocolHandler& callback) {
+  if (ContainsKey(protocol_handlers_, scheme) ||
+      job_factory_->IsHandledProtocol(scheme))
     return node::ThrowError("The scheme is already registered");
 
-  if (AtomBrowserContext::Get()->url_request_context_getter() == NULL)
-    return node::ThrowError(kEarlyUseProtocolError);
-
-  // Store the handler in a map.
-  g_handlers[scheme] = callback;
-
-  content::BrowserThread::PostTask(content::BrowserThread::IO,
-                                   FROM_HERE,
-                                   base::Bind(&RegisterProtocolInIO, scheme));
+  protocol_handlers_[scheme] = callback;
+  BrowserThread::PostTask(BrowserThread::IO,
+                          FROM_HERE,
+                          base::Bind(&Protocol::RegisterProtocolInIO,
+                                     base::Unretained(this), scheme));
 }
 
-// static
-void Protocol::UnregisterProtocol(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string scheme;
-  if (!FromV8Arguments(args, &scheme))
-    return node::ThrowTypeError("Bad argument");
-
-  if (AtomBrowserContext::Get()->url_request_context_getter() == NULL)
-    return node::ThrowError(kEarlyUseProtocolError);
-
-  // Erase the handler from map.
-  HandlersMap::iterator it(g_handlers.find(scheme));
-  if (it == g_handlers.end())
+void Protocol::UnregisterProtocol(const std::string& scheme) {
+  ProtocolHandlersMap::iterator it(protocol_handlers_.find(scheme));
+  if (it == protocol_handlers_.end())
     return node::ThrowError("The scheme has not been registered");
-  g_handlers.erase(it);
 
-  content::BrowserThread::PostTask(content::BrowserThread::IO,
-                                   FROM_HERE,
-                                   base::Bind(&UnregisterProtocolInIO, scheme));
+  protocol_handlers_.erase(it);
+  BrowserThread::PostTask(BrowserThread::IO,
+                          FROM_HERE,
+                          base::Bind(&Protocol::UnregisterProtocolInIO,
+                                     base::Unretained(this), scheme));
 }
 
-// static
-void Protocol::IsHandledProtocol(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string scheme;
-  if (!FromV8Arguments(args, &scheme))
-    return node::ThrowTypeError("Bad argument");
-
-  args.GetReturnValue().Set(GetRequestJobFactory()->IsHandledProtocol(scheme));
+bool Protocol::IsHandledProtocol(const std::string& scheme) {
+  return job_factory_->IsHandledProtocol(scheme);
 }
 
-// static
-void Protocol::InterceptProtocol(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string scheme;
-  RefCountedV8Function callback;
-  if (!FromV8Arguments(args, &scheme, &callback))
-    return node::ThrowTypeError("Bad argument");
+void Protocol::InterceptProtocol(const std::string& scheme,
+                                 const JsProtocolHandler& callback) {
+  if (!job_factory_->HasProtocolHandler(scheme))
+    return node::ThrowError("Scheme does not exist.");
 
-  if (!GetRequestJobFactory()->HasProtocolHandler(scheme))
-    return node::ThrowError("Cannot intercept procotol");
-
-  if (ContainsKey(g_handlers, scheme))
+  if (ContainsKey(protocol_handlers_, scheme))
     return node::ThrowError("Cannot intercept custom procotols");
 
-  if (AtomBrowserContext::Get()->url_request_context_getter() == NULL)
-    return node::ThrowError(kEarlyUseProtocolError);
-
-  // Store the handler in a map.
-  g_handlers[scheme] = callback;
-
-  content::BrowserThread::PostTask(content::BrowserThread::IO,
-                                   FROM_HERE,
-                                   base::Bind(&InterceptProtocolInIO, scheme));
+  protocol_handlers_[scheme] = callback;
+  BrowserThread::PostTask(BrowserThread::IO,
+                          FROM_HERE,
+                          base::Bind(&Protocol::InterceptProtocolInIO,
+                                     base::Unretained(this), scheme));
 }
 
-// static
-void Protocol::UninterceptProtocol(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string scheme;
-  if (!FromV8Arguments(args, &scheme))
-    return node::ThrowTypeError("Bad argument");
-
-  if (AtomBrowserContext::Get()->url_request_context_getter() == NULL)
-    return node::ThrowError(kEarlyUseProtocolError);
-
-  // Erase the handler from map.
-  HandlersMap::iterator it(g_handlers.find(scheme));
-  if (it == g_handlers.end())
+void Protocol::UninterceptProtocol(const std::string& scheme) {
+  ProtocolHandlersMap::iterator it(protocol_handlers_.find(scheme));
+  if (it == protocol_handlers_.end())
     return node::ThrowError("The scheme has not been registered");
-  g_handlers.erase(it);
 
-  content::BrowserThread::PostTask(content::BrowserThread::IO,
-                                   FROM_HERE,
-                                   base::Bind(&UninterceptProtocolInIO,
-                                              scheme));
+  protocol_handlers_.erase(it);
+  BrowserThread::PostTask(BrowserThread::IO,
+                          FROM_HERE,
+                          base::Bind(&Protocol::UninterceptProtocolInIO,
+                                     base::Unretained(this), scheme));
 }
 
-// static
 void Protocol::RegisterProtocolInIO(const std::string& scheme) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  AtomURLRequestJobFactory* job_factory(GetRequestJobFactory());
-  job_factory->SetProtocolHandler(scheme, new CustomProtocolHandler);
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  content::BrowserThread::PostTask(content::BrowserThread::UI,
-                                   FROM_HERE,
-                                   base::Bind(&EmitEventInUI,
-                                              "registered",
-                                              scheme));
+  job_factory_->SetProtocolHandler(scheme, new CustomProtocolHandler(this));
+  BrowserThread::PostTask(BrowserThread::UI,
+                          FROM_HERE,
+                          base::Bind(&Protocol::EmitEventInUI,
+                                     base::Unretained(this),
+                                     "registered", scheme));
 }
 
-// static
 void Protocol::UnregisterProtocolInIO(const std::string& scheme) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  AtomURLRequestJobFactory* job_factory(GetRequestJobFactory());
-  job_factory->SetProtocolHandler(scheme, NULL);
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  content::BrowserThread::PostTask(content::BrowserThread::UI,
-                                   FROM_HERE,
-                                   base::Bind(&EmitEventInUI,
-                                              "unregistered",
-                                              scheme));
+  job_factory_->SetProtocolHandler(scheme, NULL);
+  BrowserThread::PostTask(BrowserThread::UI,
+                          FROM_HERE,
+                          base::Bind(&Protocol::EmitEventInUI,
+                                     base::Unretained(this),
+                                     "unregistered", scheme));
 }
 
-// static
 void Protocol::InterceptProtocolInIO(const std::string& scheme) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  AtomURLRequestJobFactory* job_factory(GetRequestJobFactory());
-  ProtocolHandler* original_handler = job_factory->GetProtocolHandler(scheme);
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+
+  ProtocolHandler* original_handler = job_factory_->GetProtocolHandler(scheme);
   if (original_handler == NULL) {
-    content::BrowserThread::PostTask(
-        content::BrowserThread::UI,
-        FROM_HERE,
-        base::Bind(&EmitEventInUI,
-                   "error",
-                   "There is no protocol handler to intercpet"));
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
+        &Protocol::EmitEventInUI,
+        base::Unretained(this),
+        "error", "There is no protocol handler to intercpet"));
     return;
   }
 
-  job_factory->ReplaceProtocol(scheme,
-                               new CustomProtocolHandler(original_handler));
-
-  content::BrowserThread::PostTask(content::BrowserThread::UI,
-                                   FROM_HERE,
-                                   base::Bind(&EmitEventInUI,
-                                              "intercepted",
-                                              scheme));
+  job_factory_->ReplaceProtocol(
+      scheme, new CustomProtocolHandler(this, original_handler));
+  BrowserThread::PostTask(BrowserThread::UI,
+                          FROM_HERE,
+                          base::Bind(&Protocol::EmitEventInUI,
+                                     base::Unretained(this),
+                                     "intercepted", scheme));
 }
 
-// static
 void Protocol::UninterceptProtocolInIO(const std::string& scheme) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  AtomURLRequestJobFactory* job_factory(GetRequestJobFactory());
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  // Check if the protocol handler is intercepted.
   CustomProtocolHandler* handler = static_cast<CustomProtocolHandler*>(
-      job_factory->GetProtocolHandler(scheme));
+      job_factory_->GetProtocolHandler(scheme));
   if (handler->original_handler() == NULL) {
-    content::BrowserThread::PostTask(
-        content::BrowserThread::UI,
-        FROM_HERE,
-        base::Bind(&EmitEventInUI,
-                   "error",
-                   "The protocol is not intercpeted"));
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
+        &Protocol::EmitEventInUI,
+        base::Unretained(this),
+        "error", "The protocol is not intercpeted"));
     return;
   }
 
-  // Reset the protocol handler to the orignal one and delete current
-  // protocol handler.
+  // Reset the protocol handler to the orignal one and delete current protocol
+  // handler.
   ProtocolHandler* original_handler = handler->ReleaseDefaultProtocolHandler();
-  delete job_factory->ReplaceProtocol(scheme, original_handler);
+  delete job_factory_->ReplaceProtocol(scheme, original_handler);
+  BrowserThread::PostTask(BrowserThread::UI,
+                          FROM_HERE,
+                          base::Bind(&Protocol::EmitEventInUI,
+                                     base::Unretained(this),
+                                     "unintercepted", scheme));
+}
 
-  content::BrowserThread::PostTask(content::BrowserThread::UI,
-                                   FROM_HERE,
-                                   base::Bind(&EmitEventInUI,
-                                              "unintercepted",
-                                              scheme));
+void Protocol::EmitEventInUI(const std::string& event,
+                             const std::string& parameter) {
+  Emit(event, parameter);
 }
 
 // static
-void Protocol::Initialize(v8::Handle<v8::Object> target) {
-  // Remember the protocol object, used for emitting event later.
-  g_protocol_object.reset(target);
-
-  // Make sure the job factory has been created.
-  AtomBrowserContext::Get()->url_request_context_getter()->
-      GetURLRequestContext();
-
-  NODE_SET_METHOD(target, "registerProtocol", RegisterProtocol);
-  NODE_SET_METHOD(target, "unregisterProtocol", UnregisterProtocol);
-  NODE_SET_METHOD(target, "isHandledProtocol", IsHandledProtocol);
-  NODE_SET_METHOD(target, "interceptProtocol", InterceptProtocol);
-  NODE_SET_METHOD(target, "uninterceptProtocol", UninterceptProtocol);
+mate::Handle<Protocol> Protocol::Create(v8::Isolate* isolate) {
+  return CreateHandle(isolate, new Protocol);
 }
 
 }  // namespace api
 
 }  // namespace atom
 
-NODE_MODULE(atom_browser_protocol, atom::api::Protocol::Initialize)
+namespace {
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  v8::Isolate* isolate = context->GetIsolate();
+  mate::Dictionary dict(isolate, exports);
+  dict.Set("protocol", atom::api::Protocol::Create(isolate));
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_protocol, Initialize)

atom/browser/api/atom_api_protocol.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
@@ -8,36 +8,68 @@
 #include <string>
 #include <map>
 
-#include "base/basictypes.h"
-#include "v8/include/v8.h"
+#include "atom/browser/api/event_emitter.h"
+#include "base/callback.h"
+#include "native_mate/handle.h"
+
+namespace net {
+class URLRequest;
+}
 
 namespace atom {
 
+class AtomURLRequestJobFactory;
+
 namespace api {
 
-class Protocol {
+class Protocol : public mate::EventEmitter {
  public:
-  static void Initialize(v8::Handle<v8::Object> target);
+  typedef base::Callback<v8::Handle<v8::Value>(const net::URLRequest*)>
+          JsProtocolHandler;
+
+  static mate::Handle<Protocol> Create(v8::Isolate* isolate);
+
+  JsProtocolHandler GetProtocolHandler(const std::string& scheme);
+
+ protected:
+  Protocol();
+
+  // mate::Wrappable implementations:
+  virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate);
 
  private:
-  static void RegisterProtocol(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void UnregisterProtocol(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsHandledProtocol(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
+  typedef std::map<std::string, JsProtocolHandler> ProtocolHandlersMap;
 
-  static void InterceptProtocol(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void UninterceptProtocol(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
+  // Register/unregister an networking |scheme| which would be handled by
+  // |callback|.
+  void RegisterProtocol(const std::string& scheme,
+                        const JsProtocolHandler& callback);
+  void UnregisterProtocol(const std::string& scheme);
 
-  static void RegisterProtocolInIO(const std::string& scheme);
-  static void UnregisterProtocolInIO(const std::string& scheme);
+  // Returns whether a scheme has been registered.
+  // FIXME Should accept a callback and be asynchronous so we do not have to use
+  // locks.
+  bool IsHandledProtocol(const std::string& scheme);
 
-  static void InterceptProtocolInIO(const std::string& scheme);
-  static void UninterceptProtocolInIO(const std::string& scheme);
+  // Intercept/unintercept an existing protocol handler.
+  void InterceptProtocol(const std::string& scheme,
+                         const JsProtocolHandler& callback);
+  void UninterceptProtocol(const std::string& scheme);
 
-  DISALLOW_IMPLICIT_CONSTRUCTORS(Protocol);
+  // The networking related operations have to be done in IO thread.
+  void RegisterProtocolInIO(const std::string& scheme);
+  void UnregisterProtocolInIO(const std::string& scheme);
+  void InterceptProtocolInIO(const std::string& scheme);
+  void UninterceptProtocolInIO(const std::string& scheme);
+
+  // Do protocol.emit(event, parameter) under UI thread.
+  void EmitEventInUI(const std::string& event, const std::string& parameter);
+
+  AtomURLRequestJobFactory* job_factory_;
+  ProtocolHandlersMap protocol_handlers_;
+
+  DISALLOW_COPY_AND_ASSIGN(Protocol);
 };
 
 }  // namespace api

atom/browser/api/atom_api_screen.cc

@@ -0,0 +1,149 @@
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/api/atom_api_screen.h"
+
+#include <algorithm>
+#include <string>
+
+#include "atom/browser/browser.h"
+#include "atom/common/native_mate_converters/gfx_converter.h"
+#include "base/bind.h"
+#include "native_mate/dictionary.h"
+#include "native_mate/object_template_builder.h"
+#include "ui/gfx/screen.h"
+
+#include "atom/common/node_includes.h"
+
+namespace atom {
+
+namespace api {
+
+namespace {
+
+// Find an item in container according to its ID.
+template<class T>
+typename T::iterator FindById(T* container, int id) {
+  auto predicate = [id] (const typename T::value_type& item) -> bool {
+    return item.id() == id;
+  };
+  return std::find_if(container->begin(), container->end(), predicate);
+}
+
+// Convert the changed_metrics bitmask to string array.
+std::vector<std::string> MetricsToArray(uint32_t metrics) {
+  std::vector<std::string> array;
+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS)
+    array.push_back("bounds");
+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA)
+    array.push_back("workArea");
+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR)
+    array.push_back("scaleFactor");
+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_ROTATION)
+    array.push_back("rotaion");
+  return array;
+}
+
+}  // namespace
+
+Screen::Screen(gfx::Screen* screen) : screen_(screen) {
+  screen_->AddObserver(this);
+}
+
+Screen::~Screen() {
+  screen_->RemoveObserver(this);
+}
+
+gfx::Point Screen::GetCursorScreenPoint() {
+  return screen_->GetCursorScreenPoint();
+}
+
+gfx::Display Screen::GetPrimaryDisplay() {
+  return screen_->GetPrimaryDisplay();
+}
+
+std::vector<gfx::Display> Screen::GetAllDisplays() {
+  // The Screen::GetAllDisplays doesn't update when there is display added or
+  // removed, so we have to manually maintain the displays_ to make it up to
+  // date.
+  if (displays_.size() == 0)
+    displays_ = screen_->GetAllDisplays();
+  return displays_;
+}
+
+gfx::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
+  return screen_->GetDisplayNearestPoint(point);
+}
+
+gfx::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
+  return screen_->GetDisplayMatching(match_rect);
+}
+
+void Screen::OnDisplayAdded(const gfx::Display& new_display) {
+  displays_.push_back(new_display);
+  Emit("display-added", new_display);
+}
+
+void Screen::OnDisplayRemoved(const gfx::Display& old_display) {
+  auto iter = FindById(&displays_, old_display.id());
+  if (iter == displays_.end())
+    return;
+
+  displays_.erase(iter);
+  Emit("display-removed", old_display);
+}
+
+void Screen::OnDisplayMetricsChanged(const gfx::Display& display,
+                                     uint32_t changed_metrics) {
+  auto iter = FindById(&displays_, display.id());
+  if (iter == displays_.end())
+    return;
+
+  *iter = display;
+  Emit("display-metrics-changed", display, MetricsToArray(changed_metrics));
+}
+
+mate::ObjectTemplateBuilder Screen::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return mate::ObjectTemplateBuilder(isolate)
+      .SetMethod("getCursorScreenPoint", &Screen::GetCursorScreenPoint)
+      .SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
+      .SetMethod("getAllDisplays", &Screen::GetAllDisplays)
+      .SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
+      .SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
+}
+
+// static
+v8::Handle<v8::Value> Screen::Create(v8::Isolate* isolate) {
+  if (!Browser::Get()->is_ready()) {
+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
+        isolate, "Can not initialize \"screen\" module before app is ready")));
+    return v8::Undefined(isolate);
+  }
+
+  gfx::Screen* screen = gfx::Screen::GetNativeScreen();
+  if (!screen) {
+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
+        isolate, "Failed to get screen information")));
+    return v8::Undefined(isolate);
+  }
+
+  return mate::CreateHandle(isolate, new Screen(screen)).ToV8();
+}
+
+}  // namespace api
+
+}  // namespace atom
+
+namespace {
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.Set("screen", atom::api::Screen::Create(context->GetIsolate()));
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_common_screen, Initialize)

atom/browser/api/atom_api_screen.h

@@ -0,0 +1,60 @@
+// Copyright (c) 2015 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_API_ATOM_API_SCREEN_H_
+#define ATOM_BROWSER_API_ATOM_API_SCREEN_H_
+
+#include <vector>
+
+#include "atom/browser/api/event_emitter.h"
+#include "native_mate/handle.h"
+#include "ui/gfx/display_observer.h"
+
+namespace gfx {
+class Point;
+class Rect;
+class Screen;
+}
+
+namespace atom {
+
+namespace api {
+
+class Screen : public mate::EventEmitter,
+               public gfx::DisplayObserver {
+ public:
+  static v8::Handle<v8::Value> Create(v8::Isolate* isolate);
+
+ protected:
+  explicit Screen(gfx::Screen* screen);
+  virtual ~Screen();
+
+  gfx::Point GetCursorScreenPoint();
+  gfx::Display GetPrimaryDisplay();
+  std::vector<gfx::Display> GetAllDisplays();
+  gfx::Display GetDisplayNearestPoint(const gfx::Point& point);
+  gfx::Display GetDisplayMatching(const gfx::Rect& match_rect);
+
+  // gfx::DisplayObserver:
+  void OnDisplayAdded(const gfx::Display& new_display) override;
+  void OnDisplayRemoved(const gfx::Display& old_display) override;
+  void OnDisplayMetricsChanged(const gfx::Display& display,
+                               uint32_t changed_metrics) override;
+
+  // mate::Wrappable:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
+
+ private:
+  gfx::Screen* screen_;
+  std::vector<gfx::Display> displays_;
+
+  DISALLOW_COPY_AND_ASSIGN(Screen);
+};
+
+}  // namespace api
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_API_ATOM_API_SCREEN_H_

atom/browser/api/atom_api_tray.cc

@@ -0,0 +1,156 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/api/atom_api_tray.h"
+
+#include <string>
+
+#include "atom/browser/api/atom_api_menu.h"
+#include "atom/browser/ui/tray_icon.h"
+#include "atom/common/native_mate_converters/image_converter.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "native_mate/constructor.h"
+#include "native_mate/dictionary.h"
+#include "ui/gfx/image/image.h"
+
+#include "atom/common/node_includes.h"
+
+namespace atom {
+
+namespace api {
+
+Tray::Tray(const gfx::Image& image)
+    : tray_icon_(TrayIcon::Create()) {
+  tray_icon_->SetImage(image);
+  tray_icon_->AddObserver(this);
+}
+
+Tray::~Tray() {
+}
+
+// static
+mate::Wrappable* Tray::New(const gfx::Image& image) {
+  return new Tray(image);
+}
+
+void Tray::OnClicked() {
+  Emit("clicked");
+}
+
+void Tray::OnDoubleClicked() {
+  Emit("double-clicked");
+}
+
+void Tray::OnBalloonShow() {
+  Emit("balloon-show");
+}
+
+void Tray::OnBalloonClicked() {
+  Emit("balloon-clicked");
+}
+
+void Tray::OnBalloonClosed() {
+  Emit("balloon-closed");
+}
+
+void Tray::Destroy() {
+  tray_icon_.reset();
+}
+
+void Tray::SetImage(mate::Arguments* args, const gfx::Image& image) {
+  if (!CheckTrayLife(args))
+    return;
+  tray_icon_->SetImage(image);
+}
+
+void Tray::SetPressedImage(mate::Arguments* args, const gfx::Image& image) {
+  if (!CheckTrayLife(args))
+    return;
+  tray_icon_->SetPressedImage(image);
+}
+
+void Tray::SetToolTip(mate::Arguments* args, const std::string& tool_tip) {
+  if (!CheckTrayLife(args))
+    return;
+  tray_icon_->SetToolTip(tool_tip);
+}
+
+void Tray::SetTitle(mate::Arguments* args, const std::string& title) {
+  if (!CheckTrayLife(args))
+    return;
+  tray_icon_->SetTitle(title);
+}
+
+void Tray::SetHighlightMode(mate::Arguments* args, bool highlight) {
+  if (!CheckTrayLife(args))
+    return;
+  tray_icon_->SetHighlightMode(highlight);
+}
+
+void Tray::DisplayBalloon(mate::Arguments* args,
+                          const mate::Dictionary& options) {
+  if (!CheckTrayLife(args))
+    return;
+
+  gfx::Image icon;
+  options.Get("icon", &icon);
+  base::string16 title, content;
+  if (!options.Get("title", &title) ||
+      !options.Get("content", &content)) {
+    args->ThrowError("'title' and 'content' must be defined");
+    return;
+  }
+
+  tray_icon_->DisplayBalloon(icon, title, content);
+}
+
+void Tray::SetContextMenu(mate::Arguments* args, Menu* menu) {
+  if (!CheckTrayLife(args))
+    return;
+  tray_icon_->SetContextMenu(menu->model());
+}
+
+bool Tray::CheckTrayLife(mate::Arguments* args) {
+  if (!tray_icon_) {
+    args->ThrowError("Tray is already destroyed");
+    return false;
+  } else {
+    return true;
+  }
+}
+
+// static
+void Tray::BuildPrototype(v8::Isolate* isolate,
+                          v8::Handle<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
+      .SetMethod("destroy", &Tray::Destroy)
+      .SetMethod("setImage", &Tray::SetImage)
+      .SetMethod("setPressedImage", &Tray::SetPressedImage)
+      .SetMethod("setToolTip", &Tray::SetToolTip)
+      .SetMethod("setTitle", &Tray::SetTitle)
+      .SetMethod("setHighlightMode", &Tray::SetHighlightMode)
+      .SetMethod("displayBalloon", &Tray::DisplayBalloon)
+      .SetMethod("_setContextMenu", &Tray::SetContextMenu);
+}
+
+}  // namespace api
+
+}  // namespace atom
+
+
+namespace {
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  using atom::api::Tray;
+  v8::Isolate* isolate = context->GetIsolate();
+  v8::Handle<v8::Function> constructor = mate::CreateConstructor<Tray>(
+      isolate, "Tray", base::Bind(&Tray::New));
+  mate::Dictionary dict(isolate, exports);
+  dict.Set("Tray", static_cast<v8::Handle<v8::Value>>(constructor));
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_tray, Initialize)

atom/browser/api/atom_api_tray.h

@@ -0,0 +1,71 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_API_ATOM_API_TRAY_H_
+#define ATOM_BROWSER_API_ATOM_API_TRAY_H_
+
+#include <string>
+
+#include "atom/browser/api/event_emitter.h"
+#include "atom/browser/ui/tray_icon_observer.h"
+#include "base/memory/scoped_ptr.h"
+
+namespace gfx {
+class Image;
+}
+
+namespace mate {
+class Arguments;
+class Dictionary;
+}
+
+namespace atom {
+
+class TrayIcon;
+
+namespace api {
+
+class Menu;
+
+class Tray : public mate::EventEmitter,
+             public TrayIconObserver {
+ public:
+  static mate::Wrappable* New(const gfx::Image& image);
+
+  static void BuildPrototype(v8::Isolate* isolate,
+                             v8::Handle<v8::ObjectTemplate> prototype);
+
+ protected:
+  explicit Tray(const gfx::Image& image);
+  virtual ~Tray();
+
+  // TrayIconObserver:
+  void OnClicked() override;
+  void OnDoubleClicked() override;
+  void OnBalloonShow() override;
+  void OnBalloonClicked() override;
+  void OnBalloonClosed() override;
+
+  void Destroy();
+  void SetImage(mate::Arguments* args, const gfx::Image& image);
+  void SetPressedImage(mate::Arguments* args, const gfx::Image& image);
+  void SetToolTip(mate::Arguments* args, const std::string& tool_tip);
+  void SetTitle(mate::Arguments* args, const std::string& title);
+  void SetHighlightMode(mate::Arguments* args, bool highlight);
+  void DisplayBalloon(mate::Arguments* args, const mate::Dictionary& options);
+  void SetContextMenu(mate::Arguments* args, Menu* menu);
+
+ private:
+  bool CheckTrayLife(mate::Arguments* args);
+
+  scoped_ptr<TrayIcon> tray_icon_;
+
+  DISALLOW_COPY_AND_ASSIGN(Tray);
+};
+
+}  // namespace api
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_API_ATOM_API_TRAY_H_

atom/browser/api/atom_api_web_contents.cc

@@ -0,0 +1,610 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/api/atom_api_web_contents.h"
+
+#include "atom/browser/atom_browser_context.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/web_dialog_helper.h"
+#include "atom/browser/web_view_manager.h"
+#include "atom/common/api/api_messages.h"
+#include "atom/common/native_mate_converters/gfx_converter.h"
+#include "atom/common/native_mate_converters/gurl_converter.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "base/strings/utf_string_conversions.h"
+#include "brightray/browser/inspectable_web_contents.h"
+#include "content/public/browser/navigation_details.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_widget_host_view.h"
+#include "content/public/browser/resource_request_details.h"
+#include "content/public/browser/site_instance.h"
+#include "content/public/browser/web_contents.h"
+#include "native_mate/dictionary.h"
+#include "native_mate/object_template_builder.h"
+#include "vendor/brightray/browser/media/media_stream_devices_controller.h"
+
+#include "atom/common/node_includes.h"
+
+namespace atom {
+
+namespace api {
+
+namespace {
+
+v8::Persistent<v8::ObjectTemplate> template_;
+
+// Get the window that has the |guest| embedded.
+NativeWindow* GetWindowFromGuest(const content::WebContents* guest) {
+  WebViewManager::WebViewInfo info;
+  if (WebViewManager::GetInfoForProcess(guest->GetRenderProcessHost(), &info))
+    return NativeWindow::FromRenderView(
+        info.embedder->GetRenderProcessHost()->GetID(),
+        info.embedder->GetRoutingID());
+  else
+    return nullptr;
+}
+
+}  // namespace
+
+WebContents::WebContents(content::WebContents* web_contents)
+    : content::WebContentsObserver(web_contents),
+      guest_instance_id_(-1),
+      element_instance_id_(-1),
+      guest_opaque_(true),
+      auto_size_enabled_(false) {
+}
+
+WebContents::WebContents(const mate::Dictionary& options)
+    : guest_instance_id_(-1),
+      element_instance_id_(-1),
+      guest_opaque_(true),
+      auto_size_enabled_(false) {
+  options.Get("guestInstanceId", &guest_instance_id_);
+
+  auto browser_context = AtomBrowserContext::Get();
+  content::SiteInstance* site_instance = content::SiteInstance::CreateForURL(
+      browser_context, GURL("chrome-guest://fake-host"));
+
+  content::WebContents::CreateParams params(browser_context, site_instance);
+  bool is_guest;
+  if (options.Get("isGuest", &is_guest) && is_guest)
+    params.guest_delegate = this;
+
+  storage_.reset(brightray::InspectableWebContents::Create(params));
+  Observe(storage_->GetWebContents());
+  web_contents()->SetDelegate(this);
+}
+
+WebContents::~WebContents() {
+  Destroy();
+}
+
+bool WebContents::AddMessageToConsole(content::WebContents* source,
+                                      int32 level,
+                                      const base::string16& message,
+                                      int32 line_no,
+                                      const base::string16& source_id) {
+  Emit("console-message", level, message, line_no, source_id);
+  return true;
+}
+
+bool WebContents::ShouldCreateWebContents(
+    content::WebContents* web_contents,
+    int route_id,
+    WindowContainerType window_container_type,
+    const base::string16& frame_name,
+    const GURL& target_url,
+    const std::string& partition_id,
+    content::SessionStorageNamespace* session_storage_namespace) {
+  Emit("-new-window",
+       target_url,
+       frame_name,
+       static_cast<int>(NEW_FOREGROUND_TAB));
+  return false;
+}
+
+void WebContents::CloseContents(content::WebContents* source) {
+  Emit("close");
+}
+
+content::WebContents* WebContents::OpenURLFromTab(
+    content::WebContents* source,
+    const content::OpenURLParams& params) {
+  if (params.disposition != CURRENT_TAB) {
+    Emit("-new-window", params.url, "", static_cast<int>(params.disposition));
+    return nullptr;
+  }
+
+  // Give user a chance to cancel navigation.
+  if (Emit("will-navigate", params.url))
+    return nullptr;
+
+  content::NavigationController::LoadURLParams load_url_params(params.url);
+  load_url_params.referrer = params.referrer;
+  load_url_params.transition_type = params.transition;
+  load_url_params.extra_headers = params.extra_headers;
+  load_url_params.should_replace_current_entry =
+      params.should_replace_current_entry;
+  load_url_params.is_renderer_initiated = params.is_renderer_initiated;
+  load_url_params.transferred_global_request_id =
+      params.transferred_global_request_id;
+
+  web_contents()->GetController().LoadURLWithParams(load_url_params);
+  return web_contents();
+}
+
+void WebContents::RunFileChooser(content::WebContents* guest,
+                                 const content::FileChooserParams& params) {
+  if (!web_dialog_helper_)
+    web_dialog_helper_.reset(new WebDialogHelper(GetWindowFromGuest(guest)));
+  web_dialog_helper_->RunFileChooser(guest, params);
+}
+
+void WebContents::EnumerateDirectory(content::WebContents* guest,
+                                     int request_id,
+                                     const base::FilePath& path) {
+  if (!web_dialog_helper_)
+    web_dialog_helper_.reset(new WebDialogHelper(GetWindowFromGuest(guest)));
+  web_dialog_helper_->EnumerateDirectory(guest, request_id, path);
+}
+
+bool WebContents::CheckMediaAccessPermission(content::WebContents* web_contents,
+                                             const GURL& security_origin,
+                                             content::MediaStreamType type) {
+  return true;
+}
+
+void WebContents::RequestMediaAccessPermission(
+    content::WebContents*,
+    const content::MediaStreamRequest& request,
+    const content::MediaResponseCallback& callback) {
+  brightray::MediaStreamDevicesController controller(request, callback);
+  controller.TakeAction();
+}
+
+void WebContents::HandleKeyboardEvent(
+    content::WebContents* source,
+    const content::NativeWebKeyboardEvent& event) {
+  if (!attached())
+    return;
+
+  // Send the unhandled keyboard events back to the embedder to reprocess them.
+  embedder_web_contents_->GetDelegate()->HandleKeyboardEvent(
+      web_contents(), event);
+}
+
+void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
+  Emit("render-view-deleted",
+       render_view_host->GetProcess()->GetID(),
+       render_view_host->GetRoutingID());
+}
+
+void WebContents::RenderProcessGone(base::TerminationStatus status) {
+  Emit("crashed");
+}
+
+void WebContents::DidFinishLoad(content::RenderFrameHost* render_frame_host,
+                                const GURL& validated_url) {
+  bool is_main_frame = !render_frame_host->GetParent();
+  Emit("did-frame-finish-load", is_main_frame);
+
+  if (is_main_frame)
+    Emit("did-finish-load");
+}
+
+void WebContents::DidFailLoad(content::RenderFrameHost* render_frame_host,
+                              const GURL& validated_url,
+                              int error_code,
+                              const base::string16& error_description) {
+  Emit("did-fail-load", error_code, error_description);
+}
+
+void WebContents::DidStartLoading(content::RenderViewHost* render_view_host) {
+  Emit("did-start-loading");
+}
+
+void WebContents::DidStopLoading(content::RenderViewHost* render_view_host) {
+  Emit("did-stop-loading");
+}
+
+void WebContents::DidGetRedirectForResourceRequest(
+    content::RenderViewHost* render_view_host,
+    const content::ResourceRedirectDetails& details) {
+  Emit("did-get-redirect-request",
+       details.url,
+       details.new_url,
+       (details.resource_type == content::RESOURCE_TYPE_MAIN_FRAME));
+}
+
+void WebContents::DidNavigateMainFrame(
+    const content::LoadCommittedDetails& details,
+    const content::FrameNavigateParams& params) {
+  if (details.is_navigation_to_different_page())
+    Emit("did-navigate-to-different-page");
+}
+
+bool WebContents::OnMessageReceived(const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(WebContents, message)
+    IPC_MESSAGE_HANDLER(AtomViewHostMsg_Message, OnRendererMessage)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(AtomViewHostMsg_Message_Sync,
+                                    OnRendererMessageSync)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+
+  return handled;
+}
+
+void WebContents::RenderViewReady() {
+  if (!is_guest())
+    return;
+
+  // We don't want to accidentally set the opacity of an interstitial page.
+  // WebContents::GetRenderWidgetHostView will return the RWHV of an
+  // interstitial page if one is showing at this time. We only want opacity
+  // to apply to web pages.
+  if (guest_opaque_) {
+    web_contents()
+        ->GetRenderViewHost()
+        ->GetView()
+        ->SetBackgroundColorToDefault();
+  } else {
+    web_contents()->GetRenderViewHost()->GetView()->SetBackgroundColor(
+        SK_ColorTRANSPARENT);
+  }
+}
+
+void WebContents::WebContentsDestroyed() {
+  // The RenderViewDeleted was not called when the WebContents is destroyed.
+  RenderViewDeleted(web_contents()->GetRenderViewHost());
+  Emit("destroyed");
+}
+
+void WebContents::DidAttach(int guest_proxy_routing_id) {
+  Emit("did-attach");
+}
+
+void WebContents::ElementSizeChanged(const gfx::Size& old_size,
+                                     const gfx::Size& new_size) {
+  element_size_ = new_size;
+}
+
+void WebContents::GuestSizeChanged(const gfx::Size& old_size,
+                                   const gfx::Size& new_size) {
+  if (!auto_size_enabled_)
+    return;
+  guest_size_ = new_size;
+  GuestSizeChangedDueToAutoSize(old_size, new_size);
+}
+
+void WebContents::RegisterDestructionCallback(
+    const DestructionCallback& callback) {
+  destruction_callback_ = callback;
+}
+
+void WebContents::WillAttach(content::WebContents* embedder_web_contents,
+                             int browser_plugin_instance_id) {
+  embedder_web_contents_ = embedder_web_contents;
+  element_instance_id_ = browser_plugin_instance_id;
+}
+
+void WebContents::Destroy() {
+  if (storage_) {
+    if (!destruction_callback_.is_null())
+      destruction_callback_.Run();
+
+    // When force destroying the "destroyed" event is not emitted.
+    WebContentsDestroyed();
+
+    Observe(nullptr);
+    storage_.reset();
+  }
+}
+
+bool WebContents::IsAlive() const {
+  return web_contents() != NULL;
+}
+
+void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
+  content::NavigationController::LoadURLParams params(url);
+
+  GURL http_referrer;
+  if (options.Get("httpreferrer", &http_referrer))
+    params.referrer = content::Referrer(http_referrer.GetAsReferrer(),
+                                        blink::WebReferrerPolicyDefault);
+
+  params.transition_type = ui::PAGE_TRANSITION_TYPED;
+  params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE;
+  web_contents()->GetController().LoadURLWithParams(params);
+}
+
+GURL WebContents::GetURL() const {
+  return web_contents()->GetURL();
+}
+
+base::string16 WebContents::GetTitle() const {
+  return web_contents()->GetTitle();
+}
+
+bool WebContents::IsLoading() const {
+  return web_contents()->IsLoading();
+}
+
+bool WebContents::IsWaitingForResponse() const {
+  return web_contents()->IsWaitingForResponse();
+}
+
+void WebContents::Stop() {
+  web_contents()->Stop();
+}
+
+void WebContents::Reload(const mate::Dictionary& options) {
+  // Navigating to a URL would always restart the renderer process, we want this
+  // because normal reloading will break our node integration.
+  // This is done by AtomBrowserClient::ShouldSwapProcessesForNavigation.
+  LoadURL(GetURL(), options);
+}
+
+void WebContents::ReloadIgnoringCache(const mate::Dictionary& options) {
+  Reload(options);
+}
+
+bool WebContents::CanGoBack() const {
+  return web_contents()->GetController().CanGoBack();
+}
+
+bool WebContents::CanGoForward() const {
+  return web_contents()->GetController().CanGoForward();
+}
+
+bool WebContents::CanGoToOffset(int offset) const {
+  return web_contents()->GetController().CanGoToOffset(offset);
+}
+
+void WebContents::GoBack() {
+  web_contents()->GetController().GoBack();
+}
+
+void WebContents::GoForward() {
+  web_contents()->GetController().GoForward();
+}
+
+void WebContents::GoToIndex(int index) {
+  web_contents()->GetController().GoToIndex(index);
+}
+
+void WebContents::GoToOffset(int offset) {
+  web_contents()->GetController().GoToOffset(offset);
+}
+
+int WebContents::GetRoutingID() const {
+  return web_contents()->GetRoutingID();
+}
+
+int WebContents::GetProcessID() const {
+  return web_contents()->GetRenderProcessHost()->GetID();
+}
+
+bool WebContents::IsCrashed() const {
+  return web_contents()->IsCrashed();
+}
+
+void WebContents::SetUserAgent(const std::string& user_agent) {
+  web_contents()->SetUserAgentOverride(user_agent);
+}
+
+void WebContents::InsertCSS(const std::string& css) {
+  web_contents()->InsertCSS(css);
+}
+
+void WebContents::ExecuteJavaScript(const base::string16& code) {
+  web_contents()->GetMainFrame()->ExecuteJavaScript(code);
+}
+
+void WebContents::OpenDevTools() {
+  storage_->SetCanDock(false);
+  storage_->ShowDevTools();
+}
+
+void WebContents::CloseDevTools() {
+  storage_->CloseDevTools();
+}
+
+bool WebContents::IsDevToolsOpened() {
+  return storage_->IsDevToolsViewShowing();
+}
+
+void WebContents::Undo() {
+  web_contents()->Undo();
+}
+
+void WebContents::Redo() {
+  web_contents()->Redo();
+}
+
+void WebContents::Cut() {
+  web_contents()->Cut();
+}
+
+void WebContents::Copy() {
+  web_contents()->Copy();
+}
+
+void WebContents::Paste() {
+  web_contents()->Paste();
+}
+
+void WebContents::Delete() {
+  web_contents()->Delete();
+}
+
+void WebContents::SelectAll() {
+  web_contents()->SelectAll();
+}
+
+void WebContents::Unselect() {
+  web_contents()->Unselect();
+}
+
+void WebContents::Replace(const base::string16& word) {
+  web_contents()->Replace(word);
+}
+
+void WebContents::ReplaceMisspelling(const base::string16& word) {
+  web_contents()->ReplaceMisspelling(word);
+}
+
+bool WebContents::SendIPCMessage(const base::string16& channel,
+                                 const base::ListValue& args) {
+  return Send(new AtomViewMsg_Message(routing_id(), channel, args));
+}
+
+void WebContents::SetAutoSize(bool enabled,
+                              const gfx::Size& min_size,
+                              const gfx::Size& max_size) {
+  min_auto_size_ = min_size;
+  min_auto_size_.SetToMin(max_size);
+  max_auto_size_ = max_size;
+  max_auto_size_.SetToMax(min_size);
+
+  enabled &= !min_auto_size_.IsEmpty() && !max_auto_size_.IsEmpty();
+  if (!enabled && !auto_size_enabled_)
+    return;
+
+  auto_size_enabled_ = enabled;
+
+  if (!attached())
+    return;
+
+  content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
+  if (auto_size_enabled_) {
+    rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
+  } else {
+    rvh->DisableAutoResize(element_size_);
+    guest_size_ = element_size_;
+    GuestSizeChangedDueToAutoSize(guest_size_, element_size_);
+  }
+}
+
+void WebContents::SetAllowTransparency(bool allow) {
+  if (guest_opaque_ != allow)
+    return;
+
+  guest_opaque_ = !allow;
+  if (!web_contents()->GetRenderViewHost()->GetView())
+    return;
+
+  if (guest_opaque_) {
+    web_contents()
+        ->GetRenderViewHost()
+        ->GetView()
+        ->SetBackgroundColorToDefault();
+  } else {
+    web_contents()->GetRenderViewHost()->GetView()->SetBackgroundColor(
+        SK_ColorTRANSPARENT);
+  }
+}
+
+mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  if (template_.IsEmpty())
+    template_.Reset(isolate, mate::ObjectTemplateBuilder(isolate)
+        .SetMethod("destroy", &WebContents::Destroy)
+        .SetMethod("isAlive", &WebContents::IsAlive)
+        .SetMethod("_loadUrl", &WebContents::LoadURL)
+        .SetMethod("getUrl", &WebContents::GetURL)
+        .SetMethod("getTitle", &WebContents::GetTitle)
+        .SetMethod("isLoading", &WebContents::IsLoading)
+        .SetMethod("isWaitingForResponse", &WebContents::IsWaitingForResponse)
+        .SetMethod("stop", &WebContents::Stop)
+        .SetMethod("_reload", &WebContents::Reload)
+        .SetMethod("_reloadIgnoringCache", &WebContents::ReloadIgnoringCache)
+        .SetMethod("canGoBack", &WebContents::CanGoBack)
+        .SetMethod("canGoForward", &WebContents::CanGoForward)
+        .SetMethod("canGoToOffset", &WebContents::CanGoToOffset)
+        .SetMethod("goBack", &WebContents::GoBack)
+        .SetMethod("goForward", &WebContents::GoForward)
+        .SetMethod("goToIndex", &WebContents::GoToIndex)
+        .SetMethod("goToOffset", &WebContents::GoToOffset)
+        .SetMethod("getRoutingId", &WebContents::GetRoutingID)
+        .SetMethod("getProcessId", &WebContents::GetProcessID)
+        .SetMethod("isCrashed", &WebContents::IsCrashed)
+        .SetMethod("setUserAgent", &WebContents::SetUserAgent)
+        .SetMethod("insertCSS", &WebContents::InsertCSS)
+        .SetMethod("_executeJavaScript", &WebContents::ExecuteJavaScript)
+        .SetMethod("openDevTools", &WebContents::OpenDevTools)
+        .SetMethod("closeDevTools", &WebContents::CloseDevTools)
+        .SetMethod("isDevToolsOpened", &WebContents::IsDevToolsOpened)
+        .SetMethod("undo", &WebContents::Undo)
+        .SetMethod("redo", &WebContents::Redo)
+        .SetMethod("cut", &WebContents::Cut)
+        .SetMethod("copy", &WebContents::Copy)
+        .SetMethod("paste", &WebContents::Paste)
+        .SetMethod("delete", &WebContents::Delete)
+        .SetMethod("selectAll", &WebContents::SelectAll)
+        .SetMethod("unselect", &WebContents::Unselect)
+        .SetMethod("replace", &WebContents::Replace)
+        .SetMethod("replaceMisspelling", &WebContents::ReplaceMisspelling)
+        .SetMethod("_send", &WebContents::SendIPCMessage)
+        .SetMethod("setAutoSize", &WebContents::SetAutoSize)
+        .SetMethod("setAllowTransparency", &WebContents::SetAllowTransparency)
+        .SetMethod("isGuest", &WebContents::is_guest)
+        .Build());
+
+  return mate::ObjectTemplateBuilder(
+      isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
+}
+
+void WebContents::OnRendererMessage(const base::string16& channel,
+                                    const base::ListValue& args) {
+  // webContents.emit(channel, new Event(), args...);
+  Emit(base::UTF16ToUTF8(channel), args);
+}
+
+void WebContents::OnRendererMessageSync(const base::string16& channel,
+                                        const base::ListValue& args,
+                                        IPC::Message* message) {
+  // webContents.emit(channel, new Event(sender, message), args...);
+  EmitWithSender(base::UTF16ToUTF8(channel), web_contents(), message, args);
+}
+
+void WebContents::GuestSizeChangedDueToAutoSize(const gfx::Size& old_size,
+                                                const gfx::Size& new_size) {
+  Emit("size-changed",
+       old_size.width(), old_size.height(),
+       new_size.width(), new_size.height());
+}
+
+// static
+mate::Handle<WebContents> WebContents::CreateFrom(
+    v8::Isolate* isolate, content::WebContents* web_contents) {
+  return mate::CreateHandle(isolate, new WebContents(web_contents));
+}
+
+// static
+mate::Handle<WebContents> WebContents::Create(
+    v8::Isolate* isolate, const mate::Dictionary& options) {
+  return mate::CreateHandle(isolate, new WebContents(options));
+}
+
+}  // namespace api
+
+}  // namespace atom
+
+
+namespace {
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  v8::Isolate* isolate = context->GetIsolate();
+  mate::Dictionary dict(isolate, exports);
+  dict.SetMethod("create", &atom::api::WebContents::Create);
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_web_contents, Initialize)

atom/browser/api/atom_api_web_contents.h

@@ -0,0 +1,235 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
+#define ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
+
+#include <string>
+
+#include "atom/browser/api/event_emitter.h"
+#include "brightray/browser/default_web_contents_delegate.h"
+#include "content/public/browser/browser_plugin_guest_delegate.h"
+#include "content/public/browser/web_contents_delegate.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "native_mate/handle.h"
+
+namespace brightray {
+class InspectableWebContents;
+}
+
+namespace mate {
+class Dictionary;
+}
+
+namespace atom {
+
+class WebDialogHelper;
+
+namespace api {
+
+class WebContents : public mate::EventEmitter,
+                    public content::BrowserPluginGuestDelegate,
+                    public content::WebContentsDelegate,
+                    public content::WebContentsObserver {
+ public:
+  // Create from an existing WebContents.
+  static mate::Handle<WebContents> CreateFrom(
+      v8::Isolate* isolate, content::WebContents* web_contents);
+
+  // Create a new WebContents.
+  static mate::Handle<WebContents> Create(
+      v8::Isolate* isolate, const mate::Dictionary& options);
+
+  void Destroy();
+  bool IsAlive() const;
+  void LoadURL(const GURL& url, const mate::Dictionary& options);
+  GURL GetURL() const;
+  base::string16 GetTitle() const;
+  bool IsLoading() const;
+  bool IsWaitingForResponse() const;
+  void Stop();
+  void Reload(const mate::Dictionary& options);
+  void ReloadIgnoringCache(const mate::Dictionary& options);
+  bool CanGoBack() const;
+  bool CanGoForward() const;
+  bool CanGoToOffset(int offset) const;
+  void GoBack();
+  void GoForward();
+  void GoToIndex(int index);
+  void GoToOffset(int offset);
+  int GetRoutingID() const;
+  int GetProcessID() const;
+  bool IsCrashed() const;
+  void SetUserAgent(const std::string& user_agent);
+  void InsertCSS(const std::string& css);
+  void ExecuteJavaScript(const base::string16& code);
+  void OpenDevTools();
+  void CloseDevTools();
+  bool IsDevToolsOpened();
+
+  // Editing commands.
+  void Undo();
+  void Redo();
+  void Cut();
+  void Copy();
+  void Paste();
+  void Delete();
+  void SelectAll();
+  void Unselect();
+  void Replace(const base::string16& word);
+  void ReplaceMisspelling(const base::string16& word);
+
+  // Sending messages to browser.
+  bool SendIPCMessage(const base::string16& channel,
+                      const base::ListValue& args);
+
+  // Toggles autosize mode for corresponding <webview>.
+  void SetAutoSize(bool enabled,
+                   const gfx::Size& min_size,
+                   const gfx::Size& max_size);
+
+  // Sets the transparency of the guest.
+  void SetAllowTransparency(bool allow);
+
+  // Returns whether this is a guest view.
+  bool is_guest() const { return guest_instance_id_ != -1; }
+
+  // Returns whether this guest has an associated embedder.
+  bool attached() const { return !!embedder_web_contents_; }
+
+  content::WebContents* web_contents() const {
+    return content::WebContentsObserver::web_contents();
+  }
+
+ protected:
+  explicit WebContents(content::WebContents* web_contents);
+  explicit WebContents(const mate::Dictionary& options);
+  ~WebContents();
+
+  // mate::Wrappable:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
+
+  // content::WebContentsDelegate:
+  bool AddMessageToConsole(content::WebContents* source,
+                           int32 level,
+                           const base::string16& message,
+                           int32 line_no,
+                           const base::string16& source_id) override;
+  bool ShouldCreateWebContents(
+      content::WebContents* web_contents,
+      int route_id,
+      WindowContainerType window_container_type,
+      const base::string16& frame_name,
+      const GURL& target_url,
+      const std::string& partition_id,
+      content::SessionStorageNamespace* session_storage_namespace) override;
+  void CloseContents(content::WebContents* source) override;
+  content::WebContents* OpenURLFromTab(
+      content::WebContents* source,
+      const content::OpenURLParams& params) override;
+  void RunFileChooser(content::WebContents* web_contents,
+                      const content::FileChooserParams& params) override;
+  void EnumerateDirectory(content::WebContents* web_contents,
+                          int request_id,
+                          const base::FilePath& path) override;
+  bool CheckMediaAccessPermission(content::WebContents* web_contents,
+                                  const GURL& security_origin,
+                                  content::MediaStreamType type) override;
+  void RequestMediaAccessPermission(
+      content::WebContents*,
+      const content::MediaStreamRequest&,
+      const content::MediaResponseCallback&) override;
+  void HandleKeyboardEvent(
+      content::WebContents* source,
+      const content::NativeWebKeyboardEvent& event) override;
+
+  // content::WebContentsObserver:
+  void RenderViewDeleted(content::RenderViewHost*) override;
+  void RenderProcessGone(base::TerminationStatus status) override;
+  void DidFinishLoad(content::RenderFrameHost* render_frame_host,
+                     const GURL& validated_url) override;
+  void DidFailLoad(content::RenderFrameHost* render_frame_host,
+                   const GURL& validated_url,
+                   int error_code,
+                   const base::string16& error_description) override;
+  void DidStartLoading(content::RenderViewHost* render_view_host) override;
+  void DidStopLoading(content::RenderViewHost* render_view_host) override;
+  void DidGetRedirectForResourceRequest(
+      content::RenderViewHost* render_view_host,
+      const content::ResourceRedirectDetails& details) override;
+  void DidNavigateMainFrame(
+      const content::LoadCommittedDetails& details,
+      const content::FrameNavigateParams& params) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void RenderViewReady() override;
+  void WebContentsDestroyed() override;
+
+  // content::BrowserPluginGuestDelegate:
+  void DidAttach(int guest_proxy_routing_id) final;
+  void ElementSizeChanged(const gfx::Size& old_size,
+                          const gfx::Size& new_size) final;
+  void GuestSizeChanged(const gfx::Size& old_size,
+                        const gfx::Size& new_size) final;
+  void RegisterDestructionCallback(const DestructionCallback& callback) final;
+  void WillAttach(content::WebContents* embedder_web_contents,
+                  int browser_plugin_instance_id) final;
+
+ private:
+  // Called when received a message from renderer.
+  void OnRendererMessage(const base::string16& channel,
+                         const base::ListValue& args);
+
+  // Called when received a synchronous message from renderer.
+  void OnRendererMessageSync(const base::string16& channel,
+                             const base::ListValue& args,
+                             IPC::Message* message);
+
+  void GuestSizeChangedDueToAutoSize(const gfx::Size& old_size,
+                                     const gfx::Size& new_size);
+
+  scoped_ptr<WebDialogHelper> web_dialog_helper_;
+
+  // Unique ID for a guest WebContents.
+  int guest_instance_id_;
+
+  // |element_instance_id_| is an identifer that's unique to a particular
+  // element.
+  int element_instance_id_;
+
+  DestructionCallback destruction_callback_;
+
+  // Stores whether the contents of the guest can be transparent.
+  bool guest_opaque_;
+
+  // Stores the WebContents that managed by this class.
+  scoped_ptr<brightray::InspectableWebContents> storage_;
+
+  // The WebContents that attaches this guest view.
+  content::WebContents* embedder_web_contents_;
+
+  // The size of the container element.
+  gfx::Size element_size_;
+
+  // The size of the guest content. Note: In autosize mode, the container
+  // element may not match the size of the guest.
+  gfx::Size guest_size_;
+
+  // Indicates whether autosize mode is enabled or not.
+  bool auto_size_enabled_;
+
+  // The maximum size constraints of the container element in autosize mode.
+  gfx::Size max_auto_size_;
+
+  // The minimum size constraints of the container element in autosize mode.
+  gfx::Size min_auto_size_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebContents);
+};
+
+}  // namespace api
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_

atom/browser/api/atom_api_web_view_manager.cc

@@ -0,0 +1,93 @@
+// Copyright (c) 2015 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/api/atom_api_web_contents.h"
+#include "atom/browser/web_view_manager.h"
+#include "atom/common/native_mate_converters/gurl_converter.h"
+#include "content/public/browser/browser_context.h"
+#include "native_mate/dictionary.h"
+#include "net/base/filename_util.h"
+
+#include "atom/common/node_includes.h"
+
+namespace mate {
+
+template<>
+struct Converter<content::WebContents*> {
+  static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
+                     content::WebContents** out) {
+    atom::api::WebContents* contents;
+    if (!Converter<atom::api::WebContents*>::FromV8(isolate, val, &contents))
+      return false;
+    *out = contents->web_contents();
+    return true;
+  }
+};
+
+template<>
+struct Converter<atom::WebViewManager::WebViewInfo> {
+  static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
+                     atom::WebViewManager::WebViewInfo* out) {
+    Dictionary options;
+    if (!ConvertFromV8(isolate, val, &options))
+      return false;
+
+    GURL preload_url;
+    if (!options.Get("preloadUrl", &preload_url))
+      return false;
+
+    if (!preload_url.is_empty() &&
+        !net::FileURLToFilePath(preload_url, &(out->preload_script)))
+      return false;
+
+    return options.Get("nodeIntegration", &(out->node_integration)) &&
+           options.Get("plugins", &(out->plugins)) &&
+           options.Get("disableWebSecurity", &(out->disable_web_security));
+  }
+};
+
+}  // namespace mate
+
+namespace {
+
+atom::WebViewManager* GetWebViewManager(content::WebContents* web_contents) {
+  auto context = web_contents->GetBrowserContext();
+  if (context) {
+    auto manager = context->GetGuestManager();
+    return static_cast<atom::WebViewManager*>(manager);
+  } else {
+    return nullptr;
+  }
+}
+
+void AddGuest(int guest_instance_id,
+              int element_instance_id,
+              content::WebContents* embedder,
+              content::WebContents* guest_web_contents,
+              atom::WebViewManager::WebViewInfo info) {
+  auto manager = GetWebViewManager(embedder);
+  if (manager) {
+    info.guest_instance_id = guest_instance_id;
+    info.embedder = embedder;
+    manager->AddGuest(guest_instance_id, element_instance_id, embedder,
+                      guest_web_contents, info);
+  }
+}
+
+void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {
+  auto manager = GetWebViewManager(embedder);
+  if (manager)
+    manager->RemoveGuest(guest_instance_id);
+}
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("addGuest", &AddGuest);
+  dict.SetMethod("removeGuest", &RemoveGuest);
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_web_view_manager, Initialize)

atom/browser/api/atom_api_window.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_API_ATOM_API_WINDOW_H_
@@ -9,12 +9,16 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "ui/gfx/image/image.h"
 #include "atom/browser/native_window_observer.h"
-#include "atom/common/api/atom_api_event_emitter.h"
-#include "atom/common/v8/scoped_persistent.h"
+#include "atom/browser/api/event_emitter.h"
+#include "native_mate/handle.h"
 
-namespace base {
-class DictionaryValue;
+class GURL;
+
+namespace mate {
+class Arguments;
+class Dictionary;
 }
 
 namespace atom {
@@ -23,103 +27,112 @@ class NativeWindow;
 
 namespace api {
 
-class Window : public EventEmitter,
+class WebContents;
+
+class Window : public mate::EventEmitter,
                public NativeWindowObserver {
  public:
-  virtual ~Window();
+  static mate::Wrappable* New(v8::Isolate* isolate,
+                              const mate::Dictionary& options);
 
-  static void Initialize(v8::Handle<v8::Object> target);
+  static void BuildPrototype(v8::Isolate* isolate,
+                             v8::Handle<v8::ObjectTemplate> prototype);
 
-  NativeWindow* window() { return window_.get(); }
+  NativeWindow* window() const { return window_.get(); }
 
  protected:
-  explicit Window(v8::Handle<v8::Object> wrapper,
-                  base::DictionaryValue* options);
+  explicit Window(const mate::Dictionary& options);
+  virtual ~Window();
 
-  // Implementations of NativeWindowObserver.
-  virtual void OnPageTitleUpdated(bool* prevent_default,
-                                  const std::string& title) OVERRIDE;
-  virtual void OnLoadingStateChanged(bool is_loading) OVERRIDE;
-  virtual void WillCloseWindow(bool* prevent_default) OVERRIDE;
-  virtual void OnWindowClosed() OVERRIDE;
-  virtual void OnWindowBlur() OVERRIDE;
-  virtual void OnRendererUnresponsive() OVERRIDE;
-  virtual void OnRendererResponsive() OVERRIDE;
-  virtual void OnRenderViewDeleted(int process_id, int routing_id) OVERRIDE;
-  virtual void OnRendererCrashed() OVERRIDE;
+  // NativeWindowObserver:
+  void OnPageTitleUpdated(bool* prevent_default,
+                          const std::string& title) override;
+  void WillCreatePopupWindow(const base::string16& frame_name,
+                             const GURL& target_url,
+                             const std::string& partition_id,
+                             WindowOpenDisposition disposition) override;
+  void WillNavigate(bool* prevent_default, const GURL& url) override;
+  void WillCloseWindow(bool* prevent_default) override;
+  void OnWindowClosed() override;
+  void OnWindowBlur() override;
+  void OnWindowFocus() override;
+  void OnWindowMaximize() override;
+  void OnWindowUnmaximize() override;
+  void OnWindowMinimize() override;
+  void OnWindowRestore() override;
+  void OnWindowEnterFullScreen() override;
+  void OnWindowLeaveFullScreen() override;
+  void OnRendererUnresponsive() override;
+  void OnRendererResponsive() override;
 
  private:
-  static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Destroy(const v8::FunctionCallbackInfo<v8::Value>& args);
-
   // APIs for NativeWindow.
-  static void Close(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Focus(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsFocused(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Show(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Hide(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsVisible(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Maximize(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Unmaximize(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Minimize(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Restore(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetFullscreen(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsFullscreen(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetSize(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetSize(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetMinimumSize(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetMinimumSize(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetMaximumSize(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetMaximumSize(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetResizable(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsResizable(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetAlwaysOnTop(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsAlwaysOnTop(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Center(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetPosition(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetPosition(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetTitle(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetTitle(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void FlashFrame(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void SetKiosk(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsKiosk(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void OpenDevTools(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void CloseDevTools(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsDevToolsOpened(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void InspectElement(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void DebugDevTools(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void FocusOnWebView(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void BlurWebView(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsWebViewFocused(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void CapturePage(const v8::FunctionCallbackInfo<v8::Value>& args);
+  void Destroy();
+  void Close();
+  bool IsClosed();
+  void Focus();
+  bool IsFocused();
+  void Show();
+  void ShowInactive();
+  void Hide();
+  bool IsVisible();
+  void Maximize();
+  void Unmaximize();
+  bool IsMaximized();
+  void Minimize();
+  void Restore();
+  bool IsMinimized();
+  void SetFullScreen(bool fullscreen);
+  bool IsFullscreen();
+  void SetSize(int width, int height);
+  std::vector<int> GetSize();
+  void SetContentSize(int width, int height);
+  std::vector<int> GetContentSize();
+  void SetMinimumSize(int width, int height);
+  std::vector<int> GetMinimumSize();
+  void SetMaximumSize(int width, int height);
+  std::vector<int> GetMaximumSize();
+  void SetResizable(bool resizable);
+  bool IsResizable();
+  void SetAlwaysOnTop(bool top);
+  bool IsAlwaysOnTop();
+  void Center();
+  void SetPosition(int x, int y);
+  std::vector<int> GetPosition();
+  void SetTitle(const std::string& title);
+  std::string GetTitle();
+  void FlashFrame(bool flash);
+  void SetSkipTaskbar(bool skip);
+  void SetKiosk(bool kiosk);
+  bool IsKiosk();
+  void OpenDevTools();
+  void CloseDevTools();
+  bool IsDevToolsOpened();
+  void InspectElement(int x, int y);
+  void FocusOnWebView();
+  void BlurWebView();
+  bool IsWebViewFocused();
+  void SetRepresentedFilename(const std::string& filename);
+  std::string GetRepresentedFilename();
+  void SetDocumentEdited(bool edited);
+  bool IsDocumentEdited();
+  void CapturePage(mate::Arguments* args);
+  void Print(mate::Arguments* args);
+  void SetProgressBar(double progress);
+  void SetOverlayIcon(const gfx::Image& overlay,
+                      const std::string& description);
+  void SetAutoHideMenuBar(bool auto_hide);
+  bool IsMenuBarAutoHide();
+  void SetMenuBarVisibility(bool visible);
+  bool IsMenuBarVisible();
+
+#if defined(OS_MACOSX)
+  void ShowDefinitionForSelection();
+#endif
 
   // APIs for WebContents.
-  static void GetPageTitle(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsLoading(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsWaitingForResponse(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Stop(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetRoutingID(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetProcessID(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void IsCrashed(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // APIs for NavigationController.
-  static void LoadURL(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GetURL(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void CanGoBack(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void CanGoForward(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void CanGoToOffset(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GoBack(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GoForward(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GoToIndex(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void GoToOffset(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void Reload(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void ReloadIgnoringCache(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // Called when capturePage is done.
-  void OnCapturePageDone(const RefCountedV8Function& callback,
-                         const std::vector<unsigned char>& data);
+  mate::Handle<WebContents> GetWebContents(v8::Isolate* isolate) const;
+  mate::Handle<WebContents> GetDevToolsWebContents(v8::Isolate* isolate) const;
 
   scoped_ptr<NativeWindow> window_;
 
@@ -130,4 +143,27 @@ class Window : public EventEmitter,
 
 }  // namespace atom
 
+
+namespace mate {
+
+template<>
+struct Converter<atom::NativeWindow*> {
+  static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
+                     atom::NativeWindow** out) {
+    // null would be tranfered to NULL.
+    if (val->IsNull()) {
+      *out = NULL;
+      return true;
+    }
+
+    atom::api::Window* window;
+    if (!Converter<atom::api::Window*>::FromV8(isolate, val, &window))
+      return false;
+    *out = window->window();
+    return true;
+  }
+};
+
+}  // namespace mate
+
 #endif  // ATOM_BROWSER_API_ATOM_API_WINDOW_H_

atom/browser/api/atom_browser_bindings.cc

@@ -1,94 +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 "atom/browser/api/atom_browser_bindings.h"
-
-#include <vector>
-
-#include "base/logging.h"
-#include "atom/browser/api/atom_api_event.h"
-#include "atom/common/v8/native_type_conversions.h"
-#include "content/public/browser/browser_thread.h"
-
-#include "atom/common/v8/node_common.h"
-
-namespace atom {
-
-AtomBrowserBindings::AtomBrowserBindings() {
-}
-
-AtomBrowserBindings::~AtomBrowserBindings() {
-}
-
-void AtomBrowserBindings::OnRendererMessage(int process_id,
-                                            int routing_id,
-                                            const string16& channel,
-                                            const base::ListValue& args) {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-
-  scoped_ptr<V8ValueConverter> converter(new V8ValueConverter);
-
-  // process.emit(channel, 'message', process_id, routing_id);
-  std::vector<v8::Handle<v8::Value>> arguments;
-  arguments.reserve(3 + args.GetSize());
-  arguments.push_back(ToV8Value(channel));
-  const base::Value* value;
-  if (args.Get(0, &value))
-    arguments.push_back(converter->ToV8Value(value, global_env->context()));
-  arguments.push_back(v8::Integer::New(process_id));
-  arguments.push_back(v8::Integer::New(routing_id));
-
-  for (size_t i = 1; i < args.GetSize(); i++) {
-    const base::Value* value;
-    if (args.Get(i, &value))
-      arguments.push_back(converter->ToV8Value(value, global_env->context()));
-  }
-
-  node::MakeCallback(global_env->process_object(),
-                     "emit",
-                     arguments.size(),
-                     &arguments[0]);
-}
-
-void AtomBrowserBindings::OnRendererMessageSync(
-    int process_id,
-    int routing_id,
-    const string16& channel,
-    const base::ListValue& args,
-    NativeWindow* sender,
-    IPC::Message* message) {
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-
-  scoped_ptr<V8ValueConverter> converter(new V8ValueConverter);
-
-  // Create the event object.
-  v8::Handle<v8::Object> event = api::Event::CreateV8Object();
-  api::Event::Unwrap<api::Event>(event)->SetSenderAndMessage(sender, message);
-
-  // process.emit(channel, 'sync-message', event, process_id, routing_id);
-  std::vector<v8::Handle<v8::Value>> arguments;
-  arguments.reserve(3 + args.GetSize());
-  arguments.push_back(ToV8Value(channel));
-  const base::Value* value;
-  if (args.Get(0, &value))
-    arguments.push_back(converter->ToV8Value(value, global_env->context()));
-  arguments.push_back(event);
-  arguments.push_back(v8::Integer::New(process_id));
-  arguments.push_back(v8::Integer::New(routing_id));
-
-  for (size_t i = 1; i < args.GetSize(); i++) {
-    const base::Value* value;
-    if (args.Get(i, &value))
-      arguments.push_back(converter->ToV8Value(value, global_env->context()));
-  }
-
-  node::MakeCallback(global_env->process_object(),
-                     "emit",
-                     arguments.size(),
-                     &arguments[0]);
-}
-
-}  // namespace atom

atom/browser/api/atom_browser_bindings.h

@@ -1,49 +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.
-
-#ifndef ATOM_BROWSER_API_ATOM_BROWSER_BINDINGS_H_
-#define ATOM_BROWSER_API_ATOM_BROWSER_BINDINGS_H_
-
-#include "base/strings/string16.h"
-#include "atom/common/api/atom_bindings.h"
-#include "atom/common/v8/scoped_persistent.h"
-
-namespace base {
-class ListValue;
-}
-
-namespace IPC {
-class Message;
-}
-
-namespace atom {
-
-class NativeWindow;
-
-class AtomBrowserBindings : public AtomBindings {
- public:
-  AtomBrowserBindings();
-  virtual ~AtomBrowserBindings();
-
-  // Called when received a message from renderer.
-  void OnRendererMessage(int process_id,
-                         int routing_id,
-                         const string16& channel,
-                         const base::ListValue& args);
-
-  // Called when received a synchronous message from renderer.
-  void OnRendererMessageSync(int process_id,
-                             int routing_id,
-                             const string16& channel,
-                             const base::ListValue& args,
-                             NativeWindow* sender,
-                             IPC::Message* message);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AtomBrowserBindings);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_BROWSER_BINDINGS_H_

atom/browser/api/event.cc

@@ -0,0 +1,72 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/api/event.h"
+
+#include "atom/common/api/api_messages.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "content/public/browser/web_contents.h"
+#include "native_mate/object_template_builder.h"
+
+namespace mate {
+
+namespace {
+
+v8::Persistent<v8::ObjectTemplate> template_;
+
+}  // namespace
+
+Event::Event()
+    : sender_(NULL),
+      message_(NULL) {
+}
+
+Event::~Event() {
+}
+
+ObjectTemplateBuilder Event::GetObjectTemplateBuilder(v8::Isolate* isolate) {
+  if (template_.IsEmpty())
+    template_.Reset(isolate, ObjectTemplateBuilder(isolate)
+        .SetMethod("preventDefault", &Event::PreventDefault)
+        .SetMethod("sendReply", &Event::SendReply)
+        .Build());
+
+  return ObjectTemplateBuilder(
+      isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
+}
+
+void Event::SetSenderAndMessage(content::WebContents* sender,
+                                IPC::Message* message) {
+  DCHECK(!sender_);
+  DCHECK(!message_);
+  sender_ = sender;
+  message_ = message;
+
+  Observe(sender);
+}
+
+void Event::WebContentsDestroyed() {
+  sender_ = NULL;
+  message_ = NULL;
+}
+
+void Event::PreventDefault(v8::Isolate* isolate) {
+  GetWrapper(isolate)->Set(StringToV8(isolate, "defaultPrevented"),
+                           v8::True(isolate));
+}
+
+bool Event::SendReply(const base::string16& json) {
+  if (message_ == NULL || sender_ == NULL)
+    return false;
+
+  AtomViewHostMsg_Message_Sync::WriteReplyParams(message_, json);
+  return sender_->Send(message_);
+}
+
+// static
+Handle<Event> Event::Create(v8::Isolate* isolate) {
+  return CreateHandle(isolate, new Event);
+}
+
+}  // namespace mate

atom/browser/api/event.h

@@ -0,0 +1,52 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_API_EVENT_H_
+#define ATOM_BROWSER_API_EVENT_H_
+
+#include "content/public/browser/web_contents_observer.h"
+#include "native_mate/wrappable.h"
+#include "native_mate/handle.h"
+
+namespace IPC {
+class Message;
+}
+
+namespace mate {
+
+class Event : public Wrappable,
+              public content::WebContentsObserver {
+ public:
+  static Handle<Event> Create(v8::Isolate* isolate);
+
+  // Pass the sender and message to be replied.
+  void SetSenderAndMessage(content::WebContents* sender, IPC::Message* message);
+
+  // event.PreventDefault().
+  void PreventDefault(v8::Isolate* isolate);
+
+  // event.sendReply(json), used for replying synchronous message.
+  bool SendReply(const base::string16& json);
+
+ protected:
+  Event();
+  virtual ~Event();
+
+  // Wrappable implementations:
+  ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate* isolate) override;
+
+  // content::WebContentsObserver implementations:
+  void WebContentsDestroyed() override;
+
+ private:
+  // Replyer for the synchronous messages.
+  content::WebContents* sender_;
+  IPC::Message* message_;
+
+  DISALLOW_COPY_AND_ASSIGN(Event);
+};
+
+}  // namespace mate
+
+#endif  // ATOM_BROWSER_API_EVENT_H_

atom/browser/api/event_emitter.cc

@@ -0,0 +1,68 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/api/event_emitter.h"
+
+#include "atom/browser/api/event.h"
+#include "native_mate/arguments.h"
+#include "native_mate/object_template_builder.h"
+
+#include "atom/common/node_includes.h"
+
+namespace mate {
+
+namespace {
+
+v8::Persistent<v8::ObjectTemplate> event_template;
+
+void PreventDefault(mate::Arguments* args) {
+  args->GetThis()->Set(StringToV8(args->isolate(), "defaultPrevented"),
+                       v8::True(args->isolate()));
+}
+
+// Create a pure JavaScript Event object.
+v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
+  if (event_template.IsEmpty()) {
+    event_template.Reset(isolate, ObjectTemplateBuilder(isolate)
+        .SetMethod("preventDefault", &PreventDefault)
+        .Build());
+  }
+
+  return v8::Local<v8::ObjectTemplate>::New(
+      isolate, event_template)->NewInstance();
+}
+
+}  // namespace
+
+EventEmitter::EventEmitter() {
+}
+
+bool EventEmitter::CallEmit(v8::Isolate* isolate,
+                            const base::StringPiece& name,
+                            content::WebContents* sender,
+                            IPC::Message* message,
+                            ValueArray args) {
+  v8::Handle<v8::Object> event;
+  bool use_native_event = sender && message;
+
+  if (use_native_event) {
+    mate::Handle<mate::Event> native_event = mate::Event::Create(isolate);
+    native_event->SetSenderAndMessage(sender, message);
+    event = v8::Handle<v8::Object>::Cast(native_event.ToV8());
+  } else {
+    event = CreateEventObject(isolate);
+  }
+
+  // args = [name, event, args...];
+  args.insert(args.begin(), event);
+  args.insert(args.begin(), mate::StringToV8(isolate, name));
+
+  // this.emit.apply(this, args);
+  node::MakeCallback(isolate, GetWrapper(isolate), "emit", args.size(),
+                     &args[0]);
+
+  return event->Get(StringToV8(isolate, "defaultPrevented"))->BooleanValue();
+}
+
+}  // namespace mate

atom/browser/api/event_emitter.h

@@ -0,0 +1,63 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_API_EVENT_EMITTER_H_
+#define ATOM_BROWSER_API_EVENT_EMITTER_H_
+
+#include <vector>
+
+#include "native_mate/wrappable.h"
+
+namespace content {
+class WebContents;
+}
+
+namespace IPC {
+class Message;
+}
+
+namespace mate {
+
+// Provide helperers to emit event in JavaScript.
+class EventEmitter : public Wrappable {
+ public:
+  typedef std::vector<v8::Handle<v8::Value>> ValueArray;
+
+ protected:
+  EventEmitter();
+
+  // this.emit(name, new Event(), args...);
+  template<typename... Args>
+  bool Emit(const base::StringPiece& name, const Args&... args) {
+    return EmitWithSender(name, nullptr, nullptr, args...);
+  }
+
+  // this.emit(name, new Event(sender, message), args...);
+  template<typename... Args>
+  bool EmitWithSender(const base::StringPiece& name,
+                      content::WebContents* sender,
+                      IPC::Message* message,
+                      const Args&... args) {
+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
+    v8::Locker locker(isolate);
+    v8::HandleScope handle_scope(isolate);
+
+    ValueArray converted = { ConvertToV8(isolate, args)... };
+    return CallEmit(isolate, name, sender, message, converted);
+  }
+
+ private:
+  // Lower level implementations.
+  bool CallEmit(v8::Isolate* isolate,
+                const base::StringPiece& name,
+                content::WebContents* sender,
+                IPC::Message* message,
+                ValueArray args);
+
+  DISALLOW_COPY_AND_ASSIGN(EventEmitter);
+};
+
+}  // namespace mate
+
+#endif  // ATOM_BROWSER_API_EVENT_EMITTER_H_

atom/browser/api/lib/app.coffee

@@ -2,13 +2,8 @@ EventEmitter = require('events').EventEmitter
 
 bindings = process.atomBinding 'app'
 
-Application = bindings.Application
-Application::__proto__ = EventEmitter.prototype
-
-app = new Application
-
-app.getHomeDir = ->
-  process.env[if process.platform is 'win32' then 'USERPROFILE' else 'HOME']
+app = bindings.app
+app.__proto__ = EventEmitter.prototype
 
 app.setApplicationMenu = (menu) ->
   require('menu').setApplicationMenu menu
@@ -26,9 +21,17 @@ if process.platform is 'darwin'
     cancelBounce: bindings.dockCancelBounce
     setBadge: bindings.dockSetBadgeText
     getBadge: bindings.dockGetBadgeText
+    hide: bindings.dockHide
+    show: bindings.dockShow
+    setMenu: bindings.dockSetMenu
 
-# Support old event name.
+# Be compatible with old API.
 app.once 'ready', -> app.emit 'finish-launching'
+app.terminate = app.quit
+app.exit = process.exit
+app.getHomeDir = -> app.getPath 'home'
+app.getDataPath = -> app.getPath 'userData'
+app.setDataPath = (path) -> app.setPath 'userData', path
 
 # Only one App object pemitted.
 module.exports = app

atom/browser/api/lib/auto-updater.coffee

@@ -1,9 +1,8 @@
-AutoUpdater = process.atomBinding('auto_updater').AutoUpdater
+autoUpdater = process.atomBinding('auto_updater').autoUpdater
 EventEmitter = require('events').EventEmitter
 
-AutoUpdater::__proto__ = EventEmitter.prototype
+autoUpdater.__proto__ = EventEmitter.prototype
 
-autoUpdater = new AutoUpdater
 autoUpdater.on 'update-downloaded-raw', (args...) ->
   args[3] = new Date(args[3])  # releaseDate
   @emit 'update-downloaded', args..., => @quitAndInstall()
@@ -13,13 +12,13 @@ autoUpdater.quitAndInstall = ->
   BrowserWindow = require 'browser-window'
   windows = BrowserWindow.getAllWindows()
   if windows.length is 0
-    AutoUpdater::quitAndInstall.call this
+    @_quitAndInstall()
     return
 
   # Do the restart after all windows have been closed.
   app = require 'app'
   app.removeAllListeners 'window-all-closed'
-  app.once 'window-all-closed', AutoUpdater::quitAndInstall.bind(this)
+  app.once 'window-all-closed', @_quitAndInstall.bind(this)
   win.close() for win in windows
 
 module.exports = autoUpdater

atom/browser/api/lib/browser-window.coffee

@@ -1,6 +1,8 @@
 EventEmitter = require('events').EventEmitter
 IDWeakMap = require 'id-weak-map'
 app = require 'app'
+ipc = require 'ipc'
+wrapWebContents = require('web-contents').wrap
 
 BrowserWindow = process.atomBinding('window').BrowserWindow
 BrowserWindow::__proto__ = EventEmitter.prototype
@@ -14,24 +16,48 @@ BrowserWindow::_init = ->
     menu = app.getApplicationMenu()
     @setMenu menu if menu?
 
-  # Remember the window.
-  id = BrowserWindow.windows.add this
+  @webContents = @getWebContents()
+  @webContents.once 'destroyed', => @webContents = null
+
+  # Remember the window ID.
+  Object.defineProperty this, 'id',
+    value: BrowserWindow.windows.add(this)
+    enumerable: true
+
+  # Make new windows requested by links behave like "window.open"
+  @on '-new-window', (event, url, frameName) =>
+    event.sender = @webContents
+    options = show: true, width: 800, height: 600
+    ipc.emit 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', event, url, frameName, options
+
+  # Redirect "will-navigate" to webContents.
+  @on '-will-navigate', (event, url) =>
+    @webContents.emit 'will-navigate', event, url
 
   # Remove the window from weak map immediately when it's destroyed, since we
-  # could be iterating windows before GC happended.
-  @once 'destroyed', ->
-    BrowserWindow.windows.remove id if BrowserWindow.windows.has id
+  # could be iterating windows before GC happened.
+  @once 'closed', =>
+    BrowserWindow.windows.remove @id if BrowserWindow.windows.has @id
 
-  # Tell the rpc server that a render view has been deleted and we need to
-  # release all objects owned by it.
-  @on 'render-view-deleted', (event, processId, routingId) ->
-    process.emit 'ATOM_BROWSER_RELEASE_RENDER_VIEW', processId, routingId
+BrowserWindow::openDevTools = ->
+  @_openDevTools()
+
+  # Force devToolsWebContents to be created.
+  @devToolsWebContents = @getDevToolsWebContents()
+  @devToolsWebContents.once 'destroyed', => @devToolsWebContents = null
+
+  # Emit devtools events.
+  @devToolsWebContents.once 'did-finish-load', => @emit 'devtools-opened'
+  @devToolsWebContents.once 'destroyed', => @emit 'devtools-closed'
 
 BrowserWindow::toggleDevTools = ->
   if @isDevToolsOpened() then @closeDevTools() else @openDevTools()
 
-BrowserWindow::restart = ->
-  @loadUrl(@getUrl())
+BrowserWindow::getWebContents = ->
+  wrapWebContents @_getWebContents()
+
+BrowserWindow::getDevToolsWebContents = ->
+  wrapWebContents @_getDevToolsWebContents()
 
 BrowserWindow::setMenu = (menu) ->
   if process.platform is 'darwin'
@@ -50,9 +76,34 @@ BrowserWindow.getFocusedWindow = ->
   windows = BrowserWindow.getAllWindows()
   return window for window in windows when window.isFocused()
 
-BrowserWindow.fromProcessIdAndRoutingId = (processId, routingId) ->
+BrowserWindow.fromWebContents = (webContents) ->
   windows = BrowserWindow.getAllWindows()
-  return window for window in windows when window.getProcessId() == processId and
-                                           window.getRoutingId() == routingId
+  return window for window in windows when webContents.equal window.webContents
+
+BrowserWindow.fromDevToolsWebContents = (webContents) ->
+  windows = BrowserWindow.getAllWindows()
+  return window for window in windows when webContents.equal window.devToolsWebContents
+
+BrowserWindow.fromId = (id) ->
+  BrowserWindow.windows.get id
+
+# Helpers.
+BrowserWindow::loadUrl = -> @webContents.loadUrl.apply @webContents, arguments
+BrowserWindow::send = -> @webContents.send.apply @webContents, arguments
+
+# Be compatible with old API.
+BrowserWindow::restart = -> @webContents.reload()
+BrowserWindow::getUrl = -> @webContents.getUrl()
+BrowserWindow::reload = -> @webContents.reload.apply @webContents, arguments
+BrowserWindow::reloadIgnoringCache = -> @webContents.reloadIgnoringCache.apply @webContents, arguments
+BrowserWindow::getPageTitle = -> @webContents.getTitle()
+BrowserWindow::isLoading = -> @webContents.isLoading()
+BrowserWindow::isWaitingForResponse = -> @webContents.isWaitingForResponse()
+BrowserWindow::stop = -> @webContents.stop()
+BrowserWindow::getRoutingId = -> @webContents.getRoutingId()
+BrowserWindow::getProcessId = -> @webContents.getProcessId()
+BrowserWindow::isCrashed = -> @webContents.isCrashed()
+BrowserWindow::executeJavaScriptInDevTools = (code) ->
+  @devToolsWebContents.executeJavaScript code
 
 module.exports = BrowserWindow

atom/browser/api/lib/content-tracing.coffee

@@ -0,0 +1,7 @@
+module.exports = process.atomBinding 'content_tracing'
+
+# Mirrored from content::TracingController::Options
+module.exports.DEFAULT_OPTIONS = 0
+module.exports.ENABLE_SYSTRACE = 1 << 0
+module.exports.ENABLE_SAMPLING = 1 << 1
+module.exports.RECORD_CONTINUOUSLY = 1 << 2

atom/browser/api/lib/dialog.coffee

@@ -1,19 +1,35 @@
 binding = process.atomBinding 'dialog'
 v8Util = process.atomBinding 'v8_util'
+app = require 'app'
 BrowserWindow = require 'browser-window'
 
 fileDialogProperties =
-  openFile: 1, openDirectory: 2, multiSelections: 4, createDirectory: 8
+  openFile:        1 << 0
+  openDirectory:   1 << 1
+  multiSelections: 1 << 2
+  createDirectory: 1 << 3
 
 messageBoxTypes = ['none', 'info', 'warning']
 
+parseArgs = (window, options, callback) ->
+  unless window is null or window?.constructor is BrowserWindow
+    # Shift.
+    callback = options
+    options = window
+    window = null
+  if not callback? and typeof options is 'function'
+    # Shift.
+    callback = options
+    options = null
+  [window, options, callback]
+
+checkAppInitialized = ->
+  throw new Error('dialog module can only be used after app is ready') unless app.isReady()
+
 module.exports =
-  showOpenDialog: (window, options, callback) ->
-    unless window?.constructor is BrowserWindow
-      # Shift.
-      callback = options
-      options = window
-      window = null
+  showOpenDialog: (args...) ->
+    checkAppInitialized()
+    [window, options, callback] = parseArgs args...
 
     options ?= title: 'Open', properties: ['openFile']
     options.properties ?= ['openFile']
@@ -25,35 +41,45 @@ module.exports =
 
     options.title ?= ''
     options.defaultPath ?= ''
+    options.filters ?= []
+
+    wrappedCallback =
+      if typeof callback is 'function'
+        (success, result) -> callback(if success then result)
+      else
+        null
 
     binding.showOpenDialog String(options.title),
                            String(options.defaultPath),
+                           options.filters
                            properties,
                            window,
-                           callback
+                           wrappedCallback
 
-  showSaveDialog: (window, options, callback) ->
-    unless window?.constructor is BrowserWindow
-      # Shift.
-      callback = options
-      options = window
-      window = null
+  showSaveDialog: (args...) ->
+    checkAppInitialized()
+    [window, options, callback] = parseArgs args...
 
     options ?= title: 'Save'
     options.title ?= ''
     options.defaultPath ?= ''
+    options.filters ?= []
+
+    wrappedCallback =
+      if typeof callback is 'function'
+        (success, result) -> callback(if success then result)
+      else
+        null
 
     binding.showSaveDialog String(options.title),
                            String(options.defaultPath),
+                           options.filters
                            window,
-                           callback
+                           wrappedCallback
 
-  showMessageBox: (window, options, callback) ->
-    unless window?.constructor is BrowserWindow
-      # Shift.
-      callback = options
-      options = window
-      window = null
+  showMessageBox: (args...) ->
+    checkAppInitialized()
+    [window, options, callback] = parseArgs args...
 
     options ?= type: 'none'
     options.type ?= 'none'
@@ -65,14 +91,17 @@ module.exports =
     options.title ?= ''
     options.message ?= ''
     options.detail ?= ''
+    options.icon ?= null
 
     binding.showMessageBox options.type,
                            options.buttons,
-                           String(options.title),
-                           String(options.message),
-                           String(options.detail),
+                           [options.title, options.message, options.detail],
+                           options.icon,
                            window,
                            callback
 
+  showErrorBox: (args...) ->
+    binding.showErrorBox args...
+
 # Mark standard asynchronous functions.
 v8Util.setHiddenValue f, 'asynchronous', true for k, f of module.exports

atom/browser/api/lib/global-shortcut.coffee

@@ -0,0 +1,5 @@
+bindings = process.atomBinding 'global_shortcut'
+
+globalShortcut = bindings.globalShortcut
+
+module.exports = globalShortcut

atom/browser/api/lib/ipc.coffee

@@ -1,32 +1,3 @@
 EventEmitter = require('events').EventEmitter
-send = process.atomBinding('ipc').send
 
-sendWrap = (channel, processId, routingId, args...) ->
-  BrowserWindow = require 'browser-window'
-  if processId?.constructor is BrowserWindow
-    window = processId
-    args = [routingId, args...]
-    processId = window.getProcessId()
-    routingId = window.getRoutingId()
-
-  send channel, processId, routingId, [args...]
-
-class Ipc extends EventEmitter
-  constructor: ->
-    process.on 'ATOM_INTERNAL_MESSAGE', (args...) =>
-      @emit(args...)
-    process.on 'ATOM_INTERNAL_MESSAGE_SYNC', (channel, event, args...) =>
-      set = (value) -> event.sendReply JSON.stringify(value)
-
-      Object.defineProperty event, 'returnValue', {set}
-      Object.defineProperty event, 'result', {set}
-
-      @emit(channel, event, args...)
-
-  send: (processId, routingId, args...) ->
-    @sendChannel(processId, routingId, 'message', args...)
-
-  sendChannel: (args...) ->
-    sendWrap('ATOM_INTERNAL_MESSAGE', args...)
-
-module.exports = new Ipc
+module.exports = new EventEmitter

atom/browser/api/lib/menu-item.coffee

@@ -1,4 +1,5 @@
 BrowserWindow = require 'browser-window'
+v8Util = process.atomBinding 'v8_util'
 
 nextCommandId = 0
 
@@ -8,28 +9,41 @@ class MenuItem
   constructor: (options) ->
     Menu = require 'menu'
 
-    {click, @selector, @type, @label, @sublabel, @accelerator, @enabled, @visible, @checked, @groupId, @submenu} = options
+    {click, @selector, @type, @label, @sublabel, @accelerator, @icon, @enabled, @visible, @checked, @submenu} = options
 
     @type = 'submenu' if not @type? and @submenu?
     throw new Error('Invalid submenu') if @type is 'submenu' and @submenu?.constructor isnt Menu
 
-    @type = @type ? 'normal'
-    @label = @label ? ''
-    @sublabel = @sublabel ? ''
-    @accelerator = @accelerator ? null
-    @enabled = @enabled ? true
-    @visible = @visible ? true
-    @checked = @checked ? false
-    @groupId = @groupId ? null
-    @submenu = @submenu ? null
+    @overrideReadOnlyProperty 'type', 'normal'
+    @overrideReadOnlyProperty 'accelerator'
+    @overrideReadOnlyProperty 'icon'
+    @overrideReadOnlyProperty 'submenu'
+    @overrideProperty 'label', ''
+    @overrideProperty 'sublabel', ''
+    @overrideProperty 'enabled', true
+    @overrideProperty 'visible', true
+    @overrideProperty 'checked', false
 
-    throw new Error('Unknown menu type') if MenuItem.types.indexOf(@type) is -1
+    throw new Error("Unknown menu type #{@type}") if MenuItem.types.indexOf(@type) is -1
 
     @commandId = ++nextCommandId
     @click = =>
+      # Manually flip the checked flags when clicked.
+      @checked = !@checked if @type in ['checkbox', 'radio']
+
       if typeof click is 'function'
         click this, BrowserWindow.getFocusedWindow()
       else if typeof @selector is 'string'
         Menu.sendActionToFirstResponder @selector
 
+  overrideProperty: (name, defaultValue=null) ->
+    this[name] ?= defaultValue
+
+  overrideReadOnlyProperty: (name, defaultValue=null) ->
+    this[name] ?= defaultValue
+    Object.defineProperty this, name,
+      enumerable: true
+      writable: false
+      value: this[name]
+
 module.exports = MenuItem

atom/browser/api/lib/menu.coffee

@@ -1,17 +1,57 @@
 BrowserWindow = require 'browser-window'
 EventEmitter = require('events').EventEmitter
 MenuItem = require 'menu-item'
+v8Util = process.atomBinding 'v8_util'
 
 bindings = process.atomBinding 'menu'
 
+# Automatically generated radio menu item's group id.
+nextGroupId = 0
+
+# Search between seperators to find a radio menu item and return its group id,
+# otherwise generate a group id.
+generateGroupId = (items, pos) ->
+  if pos > 0
+    for i in [pos - 1..0]
+      item = items[i]
+      return item.groupId if item.type is 'radio'
+      break if item.type is 'separator'
+  else if pos < items.length
+    for i in [pos..items.length - 1]
+      item = items[i]
+      return item.groupId if item.type is 'radio'
+      break if item.type is 'separator'
+  ++nextGroupId
+
 Menu = bindings.Menu
 Menu::__proto__ = EventEmitter.prototype
 
-popup = Menu::popup
-Menu::popup = (window) ->
-  throw new TypeError('Invalid window') unless window?.constructor is BrowserWindow
+Menu::_init = ->
+  @commandsMap = {}
+  @groupsMap = {}
+  @items = []
+  @delegate =
+    isCommandIdChecked: (commandId) => @commandsMap[commandId]?.checked
+    isCommandIdEnabled: (commandId) => @commandsMap[commandId]?.enabled
+    isCommandIdVisible: (commandId) => @commandsMap[commandId]?.visible
+    getAcceleratorForCommandId: (commandId) => @commandsMap[commandId]?.accelerator
+    getIconForCommandId: (commandId) => @commandsMap[commandId]?.icon
+    executeCommand: (commandId) => @commandsMap[commandId]?.click()
+    menuWillShow: =>
+      # Make sure radio groups have at least one menu item seleted.
+      for id, group of @groupsMap
+        checked = false
+        for radioItem in group when radioItem.checked
+          checked = true
+          break
+        v8Util.setHiddenValue group[0], 'checked', true unless checked
 
-  popup.call this, window
+Menu::popup = (window, x, y) ->
+  throw new TypeError('Invalid window') unless window?.constructor is BrowserWindow
+  if x? and y?
+    @_popupAt(window, x, y)
+  else
+    @_popup window
 
 Menu::append = (item) ->
   @insert @getItemCount(), item
@@ -22,32 +62,48 @@ Menu::insert = (pos, item) ->
   switch item.type
     when 'normal' then @insertItem pos, item.commandId, item.label
     when 'checkbox' then @insertCheckItem pos, item.commandId, item.label
-    when 'radio' then @insertRadioItem pos, item.commandId, item.label, item.groupId
     when 'separator' then @insertSeparator pos
     when 'submenu' then @insertSubMenu pos, item.commandId, item.label, item.submenu
+    when 'radio'
+      # Grouping radio menu items.
+      item.overrideReadOnlyProperty 'groupId', generateGroupId(@items, pos)
+      @groupsMap[item.groupId] ?= []
+      @groupsMap[item.groupId].push item
+
+      # Setting a radio menu item should flip other items in the group.
+      v8Util.setHiddenValue item, 'checked', item.checked
+      Object.defineProperty item, 'checked',
+        enumerable: true
+        get: -> v8Util.getHiddenValue item, 'checked'
+        set: (val) =>
+          for otherItem in @groupsMap[item.groupId] when otherItem isnt item
+            v8Util.setHiddenValue otherItem, 'checked', false
+          v8Util.setHiddenValue item, 'checked', true
+
+      @insertRadioItem pos, item.commandId, item.label, item.groupId
 
   @setSublabel pos, item.sublabel if item.sublabel?
+  @setIcon pos, item.icon if item.icon?
 
-  unless @delegate?
-    @commandsMap = {}
-    @items = []
-    @delegate =
-      isCommandIdChecked: (commandId) => @commandsMap[commandId]?.checked
-      isCommandIdEnabled: (commandId) => @commandsMap[commandId]?.enabled
-      isCommandIdVisible: (commandId) => @commandsMap[commandId]?.visible
-      getAcceleratorForCommandId: (commandId) => @commandsMap[commandId]?.accelerator
-      executeCommand: (commandId) =>
-        activeItem = @commandsMap[commandId]
-        activeItem.click() if activeItem?
+  # Make menu accessable to items.
+  item.overrideReadOnlyProperty 'menu', this
+
+  # Remember the items.
   @items.splice pos, 0, item
   @commandsMap[item.commandId] = item
 
+# Force menuWillShow to be called
+Menu::_callMenuWillShow = ->
+  @delegate?.menuWillShow()
+  item.submenu._callMenuWillShow() for item in @items when item.submenu?
+
 applicationMenu = null
 Menu.setApplicationMenu = (menu) ->
   throw new TypeError('Invalid menu') unless menu?.constructor is Menu
   applicationMenu = menu  # Keep a reference.
 
   if process.platform is 'darwin'
+    menu._callMenuWillShow()
     bindings.setApplicationMenu menu
   else
     windows = BrowserWindow.getAllWindows()

atom/browser/api/lib/power-monitor.coffee

@@ -1,7 +1,6 @@
-bindings = process.atomBinding 'power_monitor'
+powerMonitor = process.atomBinding('power_monitor').powerMonitor
 EventEmitter = require('events').EventEmitter
 
-PowerMonitor = bindings.PowerMonitor
-PowerMonitor::__proto__ = EventEmitter.prototype
+powerMonitor.__proto__ = EventEmitter.prototype
 
-module.exports = new PowerMonitor
+module.exports = powerMonitor

atom/browser/api/lib/protocol.coffee

@@ -1,7 +1,10 @@
-protocol = process.atomBinding 'protocol'
+app = require 'app'
+throw new Error('Can not initialize protocol module before app is ready') unless app.isReady()
+
+protocol = process.atomBinding('protocol').protocol
 EventEmitter = require('events').EventEmitter
 
-protocol[key] = value for key, value of EventEmitter.prototype
+protocol.__proto__ = EventEmitter.prototype
 
 protocol.RequestStringJob =
 class RequestStringJob

atom/browser/api/lib/screen.coffee

@@ -0,0 +1,6 @@
+EventEmitter = require('events').EventEmitter
+
+screen = process.atomBinding('screen').screen
+screen.__proto__ = EventEmitter.prototype
+
+module.exports = screen

atom/browser/api/lib/tray.coffee

@@ -0,0 +1,10 @@
+EventEmitter = require('events').EventEmitter
+bindings = process.atomBinding 'tray'
+
+Tray = bindings.Tray
+Tray::__proto__ = EventEmitter.prototype
+Tray::setContextMenu = (menu) ->
+  @_setContextMenu menu
+  @menu = menu  # Keep a strong reference of menu.
+
+module.exports = Tray

atom/browser/api/lib/web-contents.coffee

@@ -0,0 +1,64 @@
+EventEmitter = require('events').EventEmitter
+binding = process.atomBinding 'web_contents'
+ipc = require 'ipc'
+
+module.exports.wrap = (webContents) ->
+  return null unless webContents.isAlive()
+
+  # webContents is an EventEmitter.
+  webContents.__proto__ = EventEmitter.prototype
+
+  # WebContents::send(channel, args..)
+  webContents.send = (channel, args...) ->
+    @_send channel, [args...]
+
+  # Make sure webContents.executeJavaScript would run the code only when the
+  # web contents has been loaded.
+  webContents.loaded = false
+  webContents.once 'did-finish-load', -> @loaded = true
+  webContents.executeJavaScript = (code) ->
+    if @loaded
+      @_executeJavaScript code
+    else
+      webContents.once 'did-finish-load', @_executeJavaScript.bind(this, code)
+
+  # The processId and routingId and identify a webContents.
+  webContents.getId = -> "#{@getProcessId()}-#{@getRoutingId()}"
+  webContents.equal = (other) -> @getId() is other.getId()
+
+  # Provide a default parameter for |urlOptions|.
+  webContents.loadUrl = (url, urlOptions={}) -> @_loadUrl url, urlOptions
+  webContents.reload = (urlOptions={}) -> @_reload urlOptions
+  webContents.reloadIgnoringCache = (urlOptions={}) -> @_reloadIgnoringCache urlOptions
+
+  # Translate |disposition| to string for 'new-window' event.
+  webContents.on '-new-window', (args..., disposition) ->
+    disposition =
+      switch disposition
+        when 2 then 'default'
+        when 4 then 'foreground-tab'
+        when 5 then 'background-tab'
+        when 6, 7 then 'new-window'
+        else 'other'
+    @emit 'new-window', args..., disposition
+
+  # Tell the rpc server that a render view has been deleted and we need to
+  # release all objects owned by it.
+  webContents.on 'render-view-deleted', (event, processId, routingId) ->
+    process.emit 'ATOM_BROWSER_RELEASE_RENDER_VIEW', "#{processId}-#{routingId}"
+
+  # Dispatch IPC messages to the ipc module.
+  webContents.on 'ipc-message', (event, packed) ->
+    [channel, args...] = packed
+    Object.defineProperty event, 'sender', value: webContents
+    ipc.emit channel, event, args...
+  webContents.on 'ipc-message-sync', (event, packed) ->
+    [channel, args...] = packed
+    Object.defineProperty event, 'returnValue', set: (value) -> event.sendReply JSON.stringify(value)
+    Object.defineProperty event, 'sender', value: webContents
+    ipc.emit channel, event, args...
+
+  webContents
+
+module.exports.create = (options={}) ->
+  @wrap binding.create(options)

atom/browser/atom_access_token_store.cc

@@ -0,0 +1,50 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/atom_access_token_store.h"
+
+#include <utility>
+
+#include "atom/browser/atom_browser_context.h"
+#include "atom/common/google_api_key.h"
+
+namespace atom {
+
+namespace {
+
+// Notice that we just combined the api key with the url together here, because
+// if we use the standard {url: key} format Chromium would override our key with
+// the predefined one in common.gypi of libchromiumcontent, which is empty.
+const char* kGeolocationProviderUrl =
+    "https://www.googleapis.com/geolocation/v1/geolocate?key="
+    GOOGLEAPIS_API_KEY;
+
+}  // namespace
+
+AtomAccessTokenStore::AtomAccessTokenStore() {
+}
+
+AtomAccessTokenStore::~AtomAccessTokenStore() {
+}
+
+void AtomAccessTokenStore::LoadAccessTokens(
+    const LoadAccessTokensCallbackType& callback) {
+  AccessTokenSet access_token_set;
+
+  // Equivelent to access_token_set[kGeolocationProviderUrl].
+  // Somehow base::string16 is causing compilation errors when used in a pair
+  // of std::map on Linux, this can work around it.
+  std::pair<GURL, base::string16> token_pair;
+  token_pair.first = GURL(kGeolocationProviderUrl);
+  access_token_set.insert(token_pair);
+
+  callback.Run(access_token_set,
+               AtomBrowserContext::Get()->url_request_context_getter());
+}
+
+void AtomAccessTokenStore::SaveAccessToken(const GURL& server_url,
+                                           const base::string16& access_token) {
+}
+
+}  // namespace atom

atom/browser/atom_access_token_store.h

@@ -0,0 +1,31 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_ATOM_ACCESS_TOKEN_STORE_H_
+#define ATOM_BROWSER_ATOM_ACCESS_TOKEN_STORE_H_
+
+#include "content/public/browser/access_token_store.h"
+
+namespace atom {
+
+class AtomBrowserContext;
+
+class AtomAccessTokenStore : public content::AccessTokenStore {
+ public:
+  AtomAccessTokenStore();
+  virtual ~AtomAccessTokenStore();
+
+  // content::AccessTokenStore:
+  void LoadAccessTokens(
+      const LoadAccessTokensCallbackType& callback) override;
+  void SaveAccessToken(const GURL& server_url,
+                       const base::string16& access_token) override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AtomAccessTokenStore);
+};
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_ATOM_ACCESS_TOKEN_STORE_H_

atom/browser/atom_application_delegate_mac.h

@@ -1,10 +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.
-
-#import <Cocoa/Cocoa.h>
-
-@interface AtomApplicationDelegate : NSObject<NSApplicationDelegate> {
-}
-
-@end

atom/browser/atom_browser_client.cc

@@ -1,19 +1,27 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/atom_browser_client.h"
 
+#include "atom/browser/atom_access_token_store.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
+#include "atom/browser/atom_speech_recognition_manager_delegate.h"
 #include "atom/browser/native_window.h"
-#include "atom/browser/net/atom_url_request_context_getter.h"
+#include "atom/browser/web_view_manager.h"
 #include "atom/browser/window_list.h"
+#include "atom/common/options_switches.h"
+#include "base/command_line.h"
+#include "base/strings/string_number_conversions.h"
+#include "chrome/browser/printing/printing_message_filter.h"
+#include "chrome/browser/speech/tts_message_filter.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
-#include "webkit/common/webpreferences.h"
+#include "content/public/common/web_preferences.h"
+#include "ui/base/l10n/l10n_util.h"
 
 namespace atom {
 
@@ -25,6 +33,10 @@ struct FindByProcessId {
   }
 
   bool operator() (NativeWindow* const window) {
+    content::WebContents* web_contents = window->GetWebContents();
+    if (!web_contents)
+      return false;
+
     int id = window->GetWebContents()->GetRenderProcessHost()->GetID();
     return id == child_process_id_;
   }
@@ -41,21 +53,30 @@ AtomBrowserClient::AtomBrowserClient()
 AtomBrowserClient::~AtomBrowserClient() {
 }
 
-net::URLRequestContextGetter* AtomBrowserClient::CreateRequestContext(
-    content::BrowserContext* browser_context,
-    content::ProtocolHandlerMap* protocol_handlers) {
-  return static_cast<AtomBrowserContext*>(browser_context)->
-      CreateRequestContext(protocol_handlers);
+void AtomBrowserClient::RenderProcessWillLaunch(
+    content::RenderProcessHost* host) {
+  int id = host->GetID();
+  host->AddFilter(new printing::PrintingMessageFilter(host->GetID()));
+  host->AddFilter(new TtsMessageFilter(id, host->GetBrowserContext()));
+}
+
+content::SpeechRecognitionManagerDelegate*
+    AtomBrowserClient::GetSpeechRecognitionManagerDelegate() {
+  return new AtomSpeechRecognitionManagerDelegate;
+}
+
+content::AccessTokenStore* AtomBrowserClient::CreateAccessTokenStore() {
+  return new AtomAccessTokenStore;
 }
 
 void AtomBrowserClient::OverrideWebkitPrefs(
     content::RenderViewHost* render_view_host,
     const GURL& url,
-    WebPreferences* prefs) {
+    content::WebPreferences* prefs) {
   prefs->javascript_enabled = true;
   prefs->web_security_enabled = true;
   prefs->javascript_can_open_windows_automatically = true;
-  prefs->plugins_enabled = false;
+  prefs->plugins_enabled = true;
   prefs->dom_paste_enabled = true;
   prefs->java_enabled = false;
   prefs->allow_scripts_to_close_windows = true;
@@ -65,30 +86,48 @@ void AtomBrowserClient::OverrideWebkitPrefs(
   prefs->application_cache_enabled = true;
   prefs->allow_universal_access_from_file_urls = true;
   prefs->allow_file_access_from_file_urls = true;
-  prefs->experimental_webgl_enabled = false;
-  prefs->allow_displaying_insecure_content = true;
-  prefs->allow_running_insecure_content = true;
+  prefs->experimental_webgl_enabled = true;
+  prefs->allow_displaying_insecure_content = false;
+  prefs->allow_running_insecure_content = false;
+
+  // Turn off web security for devtools.
+  if (url.SchemeIs("chrome-devtools")) {
+    prefs->web_security_enabled = false;
+    return;
+  }
+
+  // Custom preferences of guest page.
+  auto process = render_view_host->GetProcess();
+  WebViewManager::WebViewInfo info;
+  if (WebViewManager::GetInfoForProcess(process, &info)) {
+    prefs->web_security_enabled = !info.disable_web_security;
+    return;
+  }
 
   NativeWindow* window = NativeWindow::FromRenderView(
-      render_view_host->GetProcess()->GetID(),
-      render_view_host->GetRoutingID());
+      process->GetID(), render_view_host->GetRoutingID());
   if (window)
     window->OverrideWebkitPrefs(url, prefs);
 }
 
-bool AtomBrowserClient::ShouldSwapProcessesForNavigation(
+bool AtomBrowserClient::ShouldSwapBrowsingInstancesForNavigation(
     content::SiteInstance* site_instance,
     const GURL& current_url,
     const GURL& new_url) {
   if (site_instance->HasProcess())
     dying_render_process_ = site_instance->GetProcess();
 
-  // Restart renderer process for all navigations.
+  // Restart renderer process for all navigations, this relies on a patch to
+  // Chromium: http://git.io/_PaNyg.
   return true;
 }
 
+std::string AtomBrowserClient::GetApplicationLocale() {
+  return l10n_util::GetApplicationLocale("");
+}
+
 void AtomBrowserClient::AppendExtraCommandLineSwitches(
-    CommandLine* command_line,
+    base::CommandLine* command_line,
     int child_process_id) {
   WindowList* list = WindowList::GetInstance();
   NativeWindow* window = NULL;
@@ -110,14 +149,34 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
       window = *iter;
   }
 
-  if (window != NULL)
+  if (window != NULL) {
     window->AppendExtraCommandLineSwitches(command_line, child_process_id);
+  } else {
+    // Append commnad line arguments for guest web view.
+    auto child_process = content::RenderProcessHost::FromID(child_process_id);
+    WebViewManager::WebViewInfo info;
+    if (WebViewManager::GetInfoForProcess(child_process, &info)) {
+      command_line->AppendSwitchASCII(
+          switches::kGuestInstanceID,
+          base::IntToString(info.guest_instance_id));
+      command_line->AppendSwitchASCII(
+          switches::kNodeIntegration,
+          info.node_integration ? "true" : "false");
+      if (info.plugins)
+        command_line->AppendSwitch(switches::kEnablePlugins);
+      if (!info.preload_script.empty())
+        command_line->AppendSwitchPath(
+            switches::kPreloadScript,
+            info.preload_script);
+    }
+  }
 
   dying_render_process_ = NULL;
 }
 
 brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
     const content::MainFunctionParams&) {
+  v8::V8::Initialize();  // Init V8 before creating main parts.
   return new AtomBrowserMainParts;
 }
 

atom/browser/atom_browser_client.h

@@ -1,10 +1,12 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_ATOM_BROWSER_CLIENT_H_
 #define ATOM_BROWSER_ATOM_BROWSER_CLIENT_H_
 
+#include <string>
+
 #include "brightray/browser/browser_client.h"
 
 namespace atom {
@@ -15,22 +17,25 @@ class AtomBrowserClient : public brightray::BrowserClient {
   virtual ~AtomBrowserClient();
 
  protected:
-  net::URLRequestContextGetter* CreateRequestContext(
-      content::BrowserContext* browser_context,
-      content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
-  virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
-                                   const GURL& url,
-                                   WebPreferences* prefs) OVERRIDE;
-  virtual bool ShouldSwapProcessesForNavigation(
+  // content::ContentBrowserClient:
+  void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
+  content::SpeechRecognitionManagerDelegate*
+      GetSpeechRecognitionManagerDelegate() override;
+  content::AccessTokenStore* CreateAccessTokenStore() override;
+  void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
+                           const GURL& url,
+                           content::WebPreferences* prefs) override;
+  bool ShouldSwapBrowsingInstancesForNavigation(
       content::SiteInstance* site_instance,
       const GURL& current_url,
-      const GURL& new_url) OVERRIDE;
-  virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,
-                                              int child_process_id) OVERRIDE;
+      const GURL& new_url) override;
+  std::string GetApplicationLocale() override;
+  void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
+                                      int child_process_id) override;
 
  private:
-  virtual brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
-      const content::MainFunctionParams&) OVERRIDE;
+  brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
+      const content::MainFunctionParams&) override;
 
   // The render process which would be swapped out soon.
   content::RenderProcessHost* dying_render_process_;

atom/browser/atom_browser_context.cc

@@ -1,76 +1,90 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/atom_browser_context.h"
 
 #include "atom/browser/atom_browser_main_parts.h"
-#include "atom/browser/net/atom_url_request_context_getter.h"
+#include "atom/browser/net/atom_url_request_job_factory.h"
+#include "atom/browser/net/asar/asar_protocol_handler.h"
+#include "atom/browser/web_view_manager.h"
+#include "atom/common/options_switches.h"
+#include "base/command_line.h"
+#include "base/threading/sequenced_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/resource_context.h"
-#include "vendor/brightray/browser/network_delegate.h"
-
-namespace atom {
+#include "content/public/common/url_constants.h"
+#include "net/url_request/data_protocol_handler.h"
+#include "net/url_request/url_request_intercepting_job_factory.h"
+#include "url/url_constants.h"
 
 using content::BrowserThread;
 
-class AtomResourceContext : public content::ResourceContext {
- public:
-  AtomResourceContext() : getter_(NULL) {}
+namespace atom {
 
-  void set_url_request_context_getter(AtomURLRequestContextGetter* getter) {
-    getter_ = getter;
+namespace {
+
+class NoCacheBackend : public net::HttpCache::BackendFactory {
+  int CreateBackend(net::NetLog* net_log,
+                    scoped_ptr<disk_cache::Backend>* backend,
+                    const net::CompletionCallback& callback) override {
+    return net::ERR_FAILED;
   }
-
- protected:
-  virtual net::HostResolver* GetHostResolver() OVERRIDE {
-    DCHECK(getter_);
-    return getter_->host_resolver();
-  }
-
-  virtual net::URLRequestContext* GetRequestContext() OVERRIDE {
-    DCHECK(getter_);
-    return getter_->GetURLRequestContext();
-  }
-
-  virtual bool AllowMicAccess(const GURL& origin) OVERRIDE {
-    return true;
-  }
-
-  virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE {
-    return true;
-  }
-
- private:
-  AtomURLRequestContextGetter* getter_;
-
-  DISALLOW_COPY_AND_ASSIGN(AtomResourceContext);
 };
 
+}  // namespace
+
 AtomBrowserContext::AtomBrowserContext()
-    : resource_context_(new AtomResourceContext) {
+    : fake_browser_process_(new BrowserProcess),
+      job_factory_(new AtomURLRequestJobFactory) {
 }
 
 AtomBrowserContext::~AtomBrowserContext() {
 }
 
-AtomURLRequestContextGetter* AtomBrowserContext::CreateRequestContext(
-    content::ProtocolHandlerMap* protocol_handlers) {
-  DCHECK(!url_request_getter_);
-  url_request_getter_ = new AtomURLRequestContextGetter(
-      GetPath(),
-      BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
-      BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
-      base::Bind(&AtomBrowserContext::CreateNetworkDelegate,
-                 base::Unretained(this)),
-      protocol_handlers);
+net::URLRequestJobFactory* AtomBrowserContext::CreateURLRequestJobFactory(
+    content::ProtocolHandlerMap* handlers,
+    content::URLRequestInterceptorScopedVector* interceptors) {
+  scoped_ptr<AtomURLRequestJobFactory> job_factory(job_factory_);
 
-  resource_context_->set_url_request_context_getter(url_request_getter_.get());
-  return url_request_getter_.get();
+  for (content::ProtocolHandlerMap::iterator it = handlers->begin();
+       it != handlers->end(); ++it)
+    job_factory->SetProtocolHandler(it->first, it->second.release());
+  handlers->clear();
+
+  job_factory->SetProtocolHandler(
+      url::kDataScheme, new net::DataProtocolHandler);
+  job_factory->SetProtocolHandler(
+      url::kFileScheme, new asar::AsarProtocolHandler(
+          BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(
+              base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
+
+  // Set up interceptors in the reverse order.
+  scoped_ptr<net::URLRequestJobFactory> top_job_factory = job_factory.Pass();
+  content::URLRequestInterceptorScopedVector::reverse_iterator it;
+  for (it = interceptors->rbegin(); it != interceptors->rend(); ++it)
+    top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
+        top_job_factory.Pass(), make_scoped_ptr(*it)));
+  interceptors->weak_clear();
+
+  return top_job_factory.release();
 }
 
-content::ResourceContext* AtomBrowserContext::GetResourceContext() {
-  return resource_context_.get();
+net::HttpCache::BackendFactory*
+AtomBrowserContext::CreateHttpCacheBackendFactory(
+    const base::FilePath& base_path) {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kDisableHttpCache))
+    return new NoCacheBackend;
+  else
+    return brightray::BrowserContext::CreateHttpCacheBackendFactory(base_path);
+}
+
+content::BrowserPluginGuestManager* AtomBrowserContext::GetGuestManager() {
+  if (!guest_manager_)
+    guest_manager_.reset(new WebViewManager(this));
+  return guest_manager_.get();
 }
 
 // static

atom/browser/atom_browser_context.h

@@ -1,17 +1,18 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_
 #define ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_
 
-#include "base/memory/scoped_ptr.h"
 #include "brightray/browser/browser_context.h"
 
+class BrowserProcess;
+
 namespace atom {
 
-class AtomResourceContext;
-class AtomURLRequestContextGetter;
+class AtomURLRequestJobFactory;
+class WebViewManager;
 
 class AtomBrowserContext : public brightray::BrowserContext {
  public:
@@ -21,22 +22,24 @@ class AtomBrowserContext : public brightray::BrowserContext {
   // Returns the browser context singleton.
   static AtomBrowserContext* Get();
 
-  // Creates or returns the request context.
-  AtomURLRequestContextGetter* CreateRequestContext(
-      content::ProtocolHandlerMap*);
+  // brightray::URLRequestContextGetter::Delegate:
+  net::URLRequestJobFactory* CreateURLRequestJobFactory(
+      content::ProtocolHandlerMap* handlers,
+      content::URLRequestInterceptorScopedVector* interceptors) override;
+  net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
+      const base::FilePath& base_path) override;
 
-  AtomURLRequestContextGetter* url_request_context_getter() const {
-    DCHECK(url_request_getter_);
-    return url_request_getter_.get();
-  }
+  // content::BrowserContext:
+  content::BrowserPluginGuestManager* GetGuestManager() override;
 
- protected:
-  // content::BrowserContext implementations:
-  virtual content::ResourceContext* GetResourceContext() OVERRIDE;
+  AtomURLRequestJobFactory* job_factory() const { return job_factory_; }
 
  private:
-  scoped_ptr<AtomResourceContext> resource_context_;
-  scoped_refptr<AtomURLRequestContextGetter> url_request_getter_;
+  // A fake BrowserProcess object that used to feed the source code from chrome.
+  scoped_ptr<BrowserProcess> fake_browser_process_;
+  scoped_ptr<WebViewManager> guest_manager_;
+
+  AtomURLRequestJobFactory* job_factory_;  // Weak reference.
 
   DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);
 };

atom/browser/atom_browser_main_parts.cc

@@ -1,21 +1,24 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/atom_browser_main_parts.h"
 
-#include "atom/browser/api/atom_browser_bindings.h"
 #include "atom/browser/atom_browser_client.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/browser.h"
+#include "atom/browser/javascript_environment.h"
+#include "atom/browser/node_debugger.h"
+#include "atom/common/api/atom_bindings.h"
 #include "atom/common/node_bindings.h"
-#include "net/proxy/proxy_resolver_v8.h"
+#include "base/command_line.h"
+#include "v8/include/v8-debug.h"
 
-#if defined(OS_WIN)
-#include "ui/gfx/win/dpi.h"
+#if defined(USE_X11)
+#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
 #endif
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
@@ -23,9 +26,10 @@ namespace atom {
 AtomBrowserMainParts* AtomBrowserMainParts::self_ = NULL;
 
 AtomBrowserMainParts::AtomBrowserMainParts()
-    : atom_bindings_(new AtomBrowserBindings),
-      browser_(new Browser),
-      node_bindings_(NodeBindings::Create(true)) {
+    : browser_(new Browser),
+      node_bindings_(NodeBindings::Create(true)),
+      atom_bindings_(new AtomBindings),
+      gc_timer_(true, true) {
   DCHECK(!self_) << "Cannot have two AtomBrowserMainParts";
   self_ = this;
 }
@@ -46,35 +50,51 @@ brightray::BrowserContext* AtomBrowserMainParts::CreateBrowserContext() {
 void AtomBrowserMainParts::PostEarlyInitialization() {
   brightray::BrowserMainParts::PostEarlyInitialization();
 
+#if defined(USE_X11)
+  SetDPIFromGSettings();
+#endif
+
+  // The ProxyResolverV8 has setup a complete V8 environment, in order to avoid
+  // conflicts we only initialize our V8 environment after that.
+  js_env_.reset(new JavascriptEnvironment);
+
   node_bindings_->Initialize();
 
-  v8::V8::Initialize();
-
-  // Create context.
-  v8::Locker locker(node_isolate);
-  v8::HandleScope handle_scope(node_isolate);
-  v8::Local<v8::Context> context = v8::Context::New(node_isolate);
+  // Support the "--debug" switch.
+  node_debugger_.reset(new NodeDebugger(js_env_->isolate()));
 
   // Create the global environment.
-  global_env = node_bindings_->CreateEnvironment(context);
+  global_env = node_bindings_->CreateEnvironment(js_env_->context());
 
-  // Wrap whole process in one global context.
-  context->Enter();
+  // Make sure node can get correct environment when debugging.
+  if (node_debugger_->IsRunning())
+    global_env->AssignToContext(v8::Debug::GetDebugContext());
 
   // Add atom-shell extended APIs.
-  atom_bindings_->BindTo(global_env->process_object());
+  atom_bindings_->BindTo(js_env_->isolate(), global_env->process_object());
+
+  // Load everything.
+  node_bindings_->LoadEnvironment(global_env);
 }
 
 void AtomBrowserMainParts::PreMainMessageLoopRun() {
-  brightray::BrowserMainParts::PreMainMessageLoopRun();
-
+  // Run user's main script before most things get initialized, so we can have
+  // a chance to setup everything.
   node_bindings_->PrepareMessageLoop();
   node_bindings_->RunMessageLoop();
 
-  // Make sure the url request job factory is created before the
-  // will-finish-launching event.
-  static_cast<content::BrowserContext*>(AtomBrowserContext::Get())->
-      GetRequestContext();
+  // Start idle gc.
+  gc_timer_.Start(
+      FROM_HERE, base::TimeDelta::FromMinutes(1),
+      base::Bind(base::IgnoreResult(&v8::Isolate::IdleNotification),
+                 base::Unretained(js_env_->isolate()),
+                 1000));
+
+  brightray::BrowserMainParts::PreMainMessageLoopRun();
+
+#if defined(USE_X11)
+  libgtk2ui::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
+#endif
 
 #if !defined(OS_MACOSX)
   // The corresponding call in OS X is in AtomApplicationDelegate.
@@ -83,19 +103,4 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
 #endif
 }
 
-int AtomBrowserMainParts::PreCreateThreads() {
-  // Note that we are overriding the PreCreateThreads of brightray, since we
-  // are integrating node in browser, we can just be sure that an V8 instance
-  // would be prepared, while the ProxyResolverV8::CreateIsolate() would
-  // try to create a V8 isolate, which messed everything on Windows, so we
-  // have to override and call RememberDefaultIsolate on Windows instead.
-  net::ProxyResolverV8::RememberDefaultIsolate();
-
-#if defined(OS_WIN)
-  gfx::EnableHighDPISupport();
-#endif
-
-  return 0;
-}
-
 }  // namespace atom

atom/browser/atom_browser_main_parts.h

@@ -1,17 +1,20 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
 #define ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
 
+#include "base/timer/timer.h"
 #include "brightray/browser/browser_main_parts.h"
 
 namespace atom {
 
-class AtomBrowserBindings;
+class AtomBindings;
 class Browser;
+class JavascriptEnvironment;
 class NodeBindings;
+class NodeDebugger;
 
 class AtomBrowserMainParts : public brightray::BrowserMainParts {
  public:
@@ -20,26 +23,32 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
 
   static AtomBrowserMainParts* Get();
 
-  AtomBrowserBindings* atom_bindings() { return atom_bindings_.get(); }
   Browser* browser() { return browser_.get(); }
 
  protected:
   // Implementations of brightray::BrowserMainParts.
-  virtual brightray::BrowserContext* CreateBrowserContext() OVERRIDE;
+  brightray::BrowserContext* CreateBrowserContext() override;
 
   // Implementations of content::BrowserMainParts.
-  virtual void PostEarlyInitialization() OVERRIDE;
-  virtual void PreMainMessageLoopRun() OVERRIDE;
-  virtual int PreCreateThreads() OVERRIDE;
+  void PostEarlyInitialization() override;
+  void PreMainMessageLoopRun() override;
 #if defined(OS_MACOSX)
-  virtual void PreMainMessageLoopStart() OVERRIDE;
-  virtual void PostDestroyThreads() OVERRIDE;
+  void PreMainMessageLoopStart() override;
+  void PostDestroyThreads() override;
 #endif
 
  private:
-  scoped_ptr<AtomBrowserBindings> atom_bindings_;
+#if defined(USE_X11)
+  void SetDPIFromGSettings();
+#endif
+
   scoped_ptr<Browser> browser_;
+  scoped_ptr<JavascriptEnvironment> js_env_;
   scoped_ptr<NodeBindings> node_bindings_;
+  scoped_ptr<AtomBindings> atom_bindings_;
+  scoped_ptr<NodeDebugger> node_debugger_;
+
+  base::Timer gc_timer_;
 
   static AtomBrowserMainParts* self_;
 

atom/browser/atom_browser_main_parts_linux.cc

@@ -0,0 +1,82 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/atom_browser_main_parts.h"
+
+#include "base/command_line.h"
+#include "base/strings/string_number_conversions.h"
+#include "library_loaders/libgio.h"
+#include "ui/gfx/switches.h"
+
+namespace atom {
+
+namespace {
+
+const char* kInterfaceSchema = "org.gnome.desktop.interface";
+const char* kScaleFactor = "scaling-factor";
+
+bool SchemaExists(const LibGioLoader& libgio_loader, const char* schema_name) {
+  const gchar* const* schemas = libgio_loader.g_settings_list_schemas();
+  while (*schemas) {
+    if (strcmp(schema_name, static_cast<const char*>(*schemas)) == 0)
+      return true;
+    schemas++;
+  }
+  return false;
+}
+
+bool KeyExists(const LibGioLoader& libgio_loader, GSettings* client,
+               const char* key) {
+  gchar** keys = libgio_loader.g_settings_list_keys(client);
+  if (!keys)
+    return false;
+
+  gchar** iter = keys;
+  while (*iter) {
+    if (strcmp(*iter, key) == 0)
+      break;
+    iter++;
+  }
+
+  bool exists = *iter != NULL;
+  g_strfreev(keys);
+  return exists;
+}
+
+void GetDPIFromGSettings(guint* scale_factor) {
+  LibGioLoader libgio_loader;
+
+  // Try also without .0 at the end; on some systems this may be required.
+  if (!libgio_loader.Load("libgio-2.0.so.0") &&
+      !libgio_loader.Load("libgio-2.0.so")) {
+    VLOG(1) << "Cannot load gio library. Will fall back to gconf.";
+    return;
+  }
+
+  GSettings* client = nullptr;
+  if (!SchemaExists(libgio_loader, kInterfaceSchema) ||
+      !(client = libgio_loader.g_settings_new(kInterfaceSchema))) {
+    VLOG(1) << "Cannot create gsettings client.";
+    return;
+  }
+
+  if (KeyExists(libgio_loader, client, kScaleFactor))
+    *scale_factor = libgio_loader.g_settings_get_uint(client, kScaleFactor);
+
+  g_object_unref(client);
+}
+
+}  // namespace
+
+void AtomBrowserMainParts::SetDPIFromGSettings() {
+  guint scale_factor = 1;
+  GetDPIFromGSettings(&scale_factor);
+  if (scale_factor == 0)
+    scale_factor = 1;
+
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kForceDeviceScaleFactor, base::UintToString(scale_factor));
+}
+
+}  // namespace atom

atom/browser/atom_browser_main_parts_mac.mm

@@ -1,28 +1,32 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/atom_browser_main_parts.h"
 
+#import "atom/browser/mac/atom_application.h"
+#import "atom/browser/mac/atom_application_delegate.h"
 #include "base/files/file_path.h"
 #import "base/mac/foundation_util.h"
-#import "atom/browser/atom_application_mac.h"
-#import "atom/browser/atom_application_delegate_mac.h"
+#include "ui/base/l10n/l10n_util_mac.h"
 #import "vendor/brightray/common/mac/main_application_bundle.h"
 
 namespace atom {
 
 void AtomBrowserMainParts::PreMainMessageLoopStart() {
+  // Initialize locale setting.
+  l10n_util::OverrideLocaleWithCocoaLocale();
+
   // Force the NSApplication subclass to be used.
   NSApplication* application = [AtomApplication sharedApplication];
 
-  AtomApplicationDelegate* delegate = [AtomApplicationDelegate alloc];
-  [NSApp setDelegate:delegate];
+  AtomApplicationDelegate* delegate = [[AtomApplicationDelegate alloc] init];
+  [NSApp setDelegate:(id<NSFileManagerDelegate>)delegate];
 
   base::FilePath frameworkPath = brightray::MainApplicationBundlePath()
       .Append("Contents")
       .Append("Frameworks")
-      .Append("Atom Framework.framework");
+      .Append(PRODUCT_NAME " Framework.framework");
   NSBundle* frameworkBundle = [NSBundle
        bundleWithPath:base::mac::FilePathToNSString(frameworkPath)];
   NSNib* mainNib = [[NSNib alloc] initWithNibNamed:@"MainMenu"
@@ -37,7 +41,8 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() {
 }
 
 void AtomBrowserMainParts::PostDestroyThreads() {
-  [[AtomApplication sharedApplication] setDelegate:nil];
+  [[NSApp delegate] release];
+  [NSApp setDelegate:nil];
 }
 
 }  // namespace atom

atom/browser/atom_javascript_dialog_manager.cc

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/atom_javascript_dialog_manager.h"
@@ -15,21 +15,21 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
     const GURL& origin_url,
     const std::string& accept_lang,
     content::JavaScriptMessageType javascript_message_type,
-    const string16& message_text,
-    const string16& default_prompt_text,
+    const base::string16& message_text,
+    const base::string16& default_prompt_text,
     const DialogClosedCallback& callback,
     bool* did_suppress_message) {
-  callback.Run(false, string16());
+  callback.Run(false, base::string16());
 }
 
 void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
     content::WebContents* web_contents,
-    const string16& message_text,
+    const base::string16& message_text,
     bool is_reload,
     const DialogClosedCallback& callback) {
 
   bool prevent_reload = message_text.empty() ||
-                        message_text == ASCIIToUTF16("false");
+                        message_text == base::ASCIIToUTF16("false");
   callback.Run(!prevent_reload, message_text);
 }
 

atom/browser/atom_javascript_dialog_manager.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
@@ -14,24 +14,23 @@ namespace atom {
 class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
  public:
   // content::JavaScriptDialogManager implementations.
-  virtual void RunJavaScriptDialog(
+  void RunJavaScriptDialog(
       content::WebContents* web_contents,
       const GURL& origin_url,
       const std::string& accept_lang,
       content::JavaScriptMessageType javascript_message_type,
-      const string16& message_text,
-      const string16& default_prompt_text,
+      const base::string16& message_text,
+      const base::string16& default_prompt_text,
       const DialogClosedCallback& callback,
-      bool* did_suppress_message) OVERRIDE;
-  virtual void RunBeforeUnloadDialog(
+      bool* did_suppress_message) override;
+  void RunBeforeUnloadDialog(
       content::WebContents* web_contents,
-      const string16& message_text,
+      const base::string16& message_text,
       bool is_reload,
-      const DialogClosedCallback& callback) OVERRIDE;
-  virtual void CancelActiveAndPendingDialogs(
-      content::WebContents* web_contents) OVERRIDE {}
-  virtual void WebContentsDestroyed(
-      content::WebContents* web_contents) OVERRIDE {}
+      const DialogClosedCallback& callback) override;
+  void CancelActiveAndPendingDialogs(
+      content::WebContents* web_contents) override {}
+  void WebContentsDestroyed(content::WebContents* web_contents) override {}
 };
 
 }  // namespace atom

atom/browser/atom_speech_recognition_manager_delegate.cc

@@ -0,0 +1,74 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/atom_speech_recognition_manager_delegate.h"
+
+#include <string>
+
+#include "base/callback.h"
+
+namespace atom {
+
+AtomSpeechRecognitionManagerDelegate::AtomSpeechRecognitionManagerDelegate() {
+}
+
+AtomSpeechRecognitionManagerDelegate::~AtomSpeechRecognitionManagerDelegate() {
+}
+
+void AtomSpeechRecognitionManagerDelegate::OnRecognitionStart(int session_id) {
+}
+
+void AtomSpeechRecognitionManagerDelegate::OnAudioStart(int session_id) {
+}
+
+void AtomSpeechRecognitionManagerDelegate::OnEnvironmentEstimationComplete(
+    int session_id) {
+}
+
+void AtomSpeechRecognitionManagerDelegate::OnSoundStart(int session_id) {
+}
+
+void AtomSpeechRecognitionManagerDelegate::OnSoundEnd(int session_id) {
+}
+
+void AtomSpeechRecognitionManagerDelegate::OnAudioEnd(int session_id) {
+}
+
+void AtomSpeechRecognitionManagerDelegate::OnRecognitionEnd(int session_id) {
+}
+
+void AtomSpeechRecognitionManagerDelegate::OnRecognitionResults(
+    int session_id, const content::SpeechRecognitionResults& result) {
+}
+
+void AtomSpeechRecognitionManagerDelegate::OnRecognitionError(
+    int session_id, const content::SpeechRecognitionError& error) {
+}
+
+void AtomSpeechRecognitionManagerDelegate::OnAudioLevelsChange(
+    int session_id, float volume, float noise_volume) {
+}
+
+void AtomSpeechRecognitionManagerDelegate::GetDiagnosticInformation(
+    bool* can_report_metrics, std::string* hardware_info) {
+  *can_report_metrics = false;
+}
+
+void AtomSpeechRecognitionManagerDelegate::CheckRecognitionIsAllowed(
+    int session_id,
+    base::Callback<void(bool ask_user, bool is_allowed)> callback) {
+  callback.Run(true, true);
+}
+
+content::SpeechRecognitionEventListener*
+AtomSpeechRecognitionManagerDelegate::GetEventListener() {
+  return this;
+}
+
+bool AtomSpeechRecognitionManagerDelegate::FilterProfanities(
+    int render_process_id) {
+  return false;
+}
+
+}  // namespace atom

atom/browser/atom_speech_recognition_manager_delegate.h

@@ -0,0 +1,52 @@
+// Copyright (c) 2014 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
+#define ATOM_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
+
+#include <string>
+
+#include "content/public/browser/speech_recognition_event_listener.h"
+#include "content/public/browser/speech_recognition_manager_delegate.h"
+
+namespace atom {
+
+class AtomSpeechRecognitionManagerDelegate
+    : public content::SpeechRecognitionManagerDelegate,
+      public content::SpeechRecognitionEventListener {
+ public:
+  AtomSpeechRecognitionManagerDelegate();
+  virtual ~AtomSpeechRecognitionManagerDelegate();
+
+  // content::SpeechRecognitionEventListener:
+  void OnRecognitionStart(int session_id) override;
+  void OnAudioStart(int session_id) override;
+  void OnEnvironmentEstimationComplete(int session_id) override;
+  void OnSoundStart(int session_id) override;
+  void OnSoundEnd(int session_id) override;
+  void OnAudioEnd(int session_id) override;
+  void OnRecognitionEnd(int session_id) override;
+  void OnRecognitionResults(
+      int session_id, const content::SpeechRecognitionResults& result) override;
+  void OnRecognitionError(
+      int session_id, const content::SpeechRecognitionError& error) override;
+  void OnAudioLevelsChange(int session_id, float volume,
+                           float noise_volume) override;
+
+  // content::SpeechRecognitionManagerDelegate:
+  void GetDiagnosticInformation(bool* can_report_metrics,
+                                std::string* hardware_info) override;
+  void CheckRecognitionIsAllowed(
+      int session_id,
+      base::Callback<void(bool ask_user, bool is_allowed)> callback) override;
+  content::SpeechRecognitionEventListener* GetEventListener() override;
+  bool FilterProfanities(int render_process_id) override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AtomSpeechRecognitionManagerDelegate);
+};
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_

atom/browser/auto_updater.cc

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/auto_updater.h"

atom/browser/auto_updater.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_AUTO_UPDATER_H_

atom/browser/auto_updater_delegate.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_AUTO_UPDATER_DELEGATE_H_

atom/browser/auto_updater_linux.cc

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/auto_updater.h"

atom/browser/auto_updater_mac.mm

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/auto_updater.h"
@@ -48,11 +48,13 @@ void AutoUpdater::SetFeedURL(const std::string& feed) {
     [[g_updater rac_valuesForKeyPath:@"state" observer:g_updater]
       subscribeNext:^(NSNumber *stateNumber) {
         int state = [stateNumber integerValue];
-        if (state == SQRLUpdaterStateCheckingForUpdate) {
-          delegate->OnCheckingForUpdate();
-        } else if (state == SQRLUpdaterStateDownloadingUpdate) {
-          delegate->OnUpdateAvailable();
-        }
+        // Dispatching the event on main thread.
+        dispatch_async(dispatch_get_main_queue(), ^{
+          if (state == SQRLUpdaterStateCheckingForUpdate)
+            delegate->OnCheckingForUpdate();
+          else if (state == SQRLUpdaterStateDownloadingUpdate)
+            delegate->OnUpdateAvailable();
+        });
     }];
   }
 }
@@ -89,4 +91,5 @@ void AutoUpdater::CheckForUpdates() {
         delegate->OnError(base::SysNSStringToUTF8(error.localizedDescription));
       }];
 }
+
 }  // namespace auto_updater

atom/browser/auto_updater_win.cc

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/auto_updater.h"

atom/browser/browser.cc

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/browser.h"
@@ -8,11 +8,13 @@
 
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/window_list.h"
+#include "base/message_loop/message_loop.h"
 
 namespace atom {
 
 Browser::Browser()
-    : is_quiting_(false) {
+    : is_quiting_(false),
+      is_ready_(false) {
   WindowList::AddObserver(this);
 }
 
@@ -26,15 +28,24 @@ Browser* Browser::Get() {
 }
 
 void Browser::Quit() {
-  is_quiting_ = true;
+  is_quiting_ = HandleBeforeQuit();
+  if (!is_quiting_)
+    return;
 
   atom::WindowList* window_list = atom::WindowList::GetInstance();
   if (window_list->size() == 0)
-    NotifyAndTerminate();
+    NotifyAndShutdown();
 
   window_list->CloseAllWindows();
 }
 
+void Browser::Shutdown() {
+  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnQuit());
+
+  is_quiting_ = true;
+  base::MessageLoop::current()->Quit();
+}
+
 std::string Browser::GetVersion() const {
   if (version_override_.empty()) {
     std::string version = GetExecutableFileVersion();
@@ -61,6 +72,10 @@ std::string Browser::GetName() const {
 
 void Browser::SetName(const std::string& name) {
   name_override_ = name;
+
+#if defined(OS_WIN)
+  SetAppUserModelID(name);
+#endif
 }
 
 bool Browser::OpenFile(const std::string& file_path) {
@@ -85,10 +100,11 @@ void Browser::WillFinishLaunching() {
 }
 
 void Browser::DidFinishLaunching() {
+  is_ready_ = true;
   FOR_EACH_OBSERVER(BrowserObserver, observers_, OnFinishLaunching());
 }
 
-void Browser::NotifyAndTerminate() {
+void Browser::NotifyAndShutdown() {
   bool prevent_default = false;
   FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWillQuit(&prevent_default));
 
@@ -97,22 +113,28 @@ void Browser::NotifyAndTerminate() {
     return;
   }
 
-  Terminate();
+  Shutdown();
+}
+
+bool Browser::HandleBeforeQuit() {
+  bool prevent_default = false;
+  FOR_EACH_OBSERVER(BrowserObserver,
+                    observers_,
+                    OnBeforeQuit(&prevent_default));
+
+  return !prevent_default;
 }
 
 void Browser::OnWindowCloseCancelled(NativeWindow* window) {
-  if (is_quiting_) {
+  if (is_quiting_)
     // Once a beforeunload handler has prevented the closing, we think the quit
     // is cancelled too.
     is_quiting_ = false;
-
-    CancelQuit();
-  }
 }
 
 void Browser::OnWindowAllClosed() {
   if (is_quiting_)
-    NotifyAndTerminate();
+    NotifyAndShutdown();
   else
     FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWindowAllClosed());
 }

atom/browser/browser.h

@@ -1,11 +1,12 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_BROWSER_H_
 #define ATOM_BROWSER_BROWSER_H_
 
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -13,6 +14,19 @@
 #include "atom/browser/browser_observer.h"
 #include "atom/browser/window_list_observer.h"
 
+#if defined(OS_WIN)
+#include "base/files/file_path.h"
+#include "base/strings/string16.h"
+#endif
+
+namespace base {
+class FilePath;
+}
+
+namespace ui {
+class MenuModel;
+}
+
 namespace atom {
 
 // This class is used for control application-wide operations.
@@ -26,8 +40,8 @@ class Browser : public WindowListObserver {
   // Try to close all windows and quit the application.
   void Quit();
 
-  // Quit the application immediately without cleanup work.
-  void Terminate();
+  // Cleanup everything and shutdown the application gracefully.
+  void Shutdown();
 
   // Focus the application.
   void Focus();
@@ -44,6 +58,12 @@ class Browser : public WindowListObserver {
   // Overrides the application name.
   void SetName(const std::string& name);
 
+  // Add the |path| to recent documents list.
+  void AddRecentDocument(const base::FilePath& path);
+
+  // Clear the recent documents list.
+  void ClearRecentDocuments();
+
 #if defined(OS_MACOSX)
   // Bounce the dock icon.
   enum BounceType {
@@ -56,8 +76,32 @@ class Browser : public WindowListObserver {
   // Set/Get dock's badge text.
   void DockSetBadgeText(const std::string& label);
   std::string DockGetBadgeText();
+
+  // Hide/Show dock.
+  void DockHide();
+  void DockShow();
+
+  // Set docks' menu.
+  void DockSetMenu(ui::MenuModel* model);
 #endif  // defined(OS_MACOSX)
 
+#if defined(OS_WIN)
+  struct UserTask {
+    base::FilePath program;
+    base::string16 arguments;
+    base::string16 title;
+    base::string16 description;
+    base::FilePath icon_path;
+    int icon_index;
+  };
+
+  // Add a custom task to jump list.
+  void SetUserTasks(const std::vector<UserTask>& tasks);
+
+  // Set the application user model ID, called when "SetName" is called.
+  void SetAppUserModelID(const std::string& name);
+#endif
+
   // Tell the application to open a file.
   bool OpenFile(const std::string& file_path);
 
@@ -80,6 +124,7 @@ class Browser : public WindowListObserver {
   }
 
   bool is_quiting() const { return is_quiting_; }
+  bool is_ready() const { return is_ready_; }
 
  protected:
   // Returns the version of application bundle or executable file.
@@ -88,25 +133,32 @@ class Browser : public WindowListObserver {
   // Returns the name of application bundle or executable file.
   std::string GetExecutableFileProductName() const;
 
-  // Send the will-quit message and then terminate the application.
-  void NotifyAndTerminate();
+  // Send the will-quit message and then shutdown the application.
+  void NotifyAndShutdown();
 
-  // Tell the system we have cancelled quiting.
-  void CancelQuit();
+  // Send the before-quit message and start closing windows.
+  bool HandleBeforeQuit();
 
   bool is_quiting_;
 
  private:
   // WindowListObserver implementations:
-  virtual void OnWindowCloseCancelled(NativeWindow* window) OVERRIDE;
-  virtual void OnWindowAllClosed() OVERRIDE;
+  void OnWindowCloseCancelled(NativeWindow* window) override;
+  void OnWindowAllClosed() override;
 
   // Observers of the browser.
   ObserverList<BrowserObserver> observers_;
 
+  // Whether "ready" event has been emitted.
+  bool is_ready_;
+
   std::string version_override_;
   std::string name_override_;
 
+#if defined(OS_WIN)
+  base::string16 app_user_model_id_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 

atom/browser/browser_linux.cc

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/browser.h"
@@ -12,11 +12,6 @@
 
 namespace atom {
 
-void Browser::Terminate() {
-  is_quiting_ = true;
-  exit(0);
-}
-
 void Browser::Focus() {
   // Focus on the first visible window.
   WindowList* list = WindowList::GetInstance();
@@ -29,6 +24,12 @@ void Browser::Focus() {
   }
 }
 
+void Browser::AddRecentDocument(const base::FilePath& path) {
+}
+
+void Browser::ClearRecentDocuments() {
+}
+
 std::string Browser::GetExecutableFileVersion() const {
   return ATOM_VERSION_STRING;
 }
@@ -37,8 +38,4 @@ std::string Browser::GetExecutableFileProductName() const {
   return "Atom-Shell";
 }
 
-void Browser::CancelQuit() {
-  // No way to cancel quit on Linux.
-}
-
 }  // namespace atom

atom/browser/browser_mac.mm

@@ -1,24 +1,31 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/browser.h"
 
+#import "atom/browser/mac/atom_application.h"
+#import "atom/browser/mac/atom_application_delegate.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/window_list.h"
 #import "base/mac/bundle_locations.h"
+#import "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
-#import "atom/browser/atom_application_mac.h"
 
 namespace atom {
 
-void Browser::Terminate() {
-  is_quiting_ = true;
-  [[AtomApplication sharedApplication] terminate:nil];
-}
-
 void Browser::Focus() {
   [[AtomApplication sharedApplication] activateIgnoringOtherApps:YES];
 }
 
+void Browser::AddRecentDocument(const base::FilePath& path) {
+  NSURL* u = [NSURL fileURLWithPath:base::mac::FilePathToNSString(path)];
+  [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:u];
+}
+
+void Browser::ClearRecentDocuments() {
+}
+
 std::string Browser::GetExecutableFileVersion() const {
   NSDictionary* infoDictionary = base::mac::OuterBundle().infoDictionary;
   NSString *version = [infoDictionary objectForKey:@"CFBundleVersion"];
@@ -31,12 +38,8 @@ std::string Browser::GetExecutableFileProductName() const {
   return base::SysNSStringToUTF8(version);
 }
 
-void Browser::CancelQuit() {
-  [[AtomApplication sharedApplication] replyToApplicationShouldTerminate:NO];
-}
-
 int Browser::DockBounce(BounceType type) {
-  return [[AtomApplication sharedApplication] requestUserAttention:type];
+  return [[AtomApplication sharedApplication] requestUserAttention:(NSRequestUserAttentionType)type];
 }
 
 void Browser::DockCancelBounce(int rid) {
@@ -53,4 +56,23 @@ std::string Browser::DockGetBadgeText() {
   return base::SysNSStringToUTF8([tile badgeLabel]);
 }
 
+void Browser::DockHide() {
+  WindowList* list = WindowList::GetInstance();
+  for (WindowList::iterator it = list->begin(); it != list->end(); ++it)
+    [(*it)->GetNativeWindow() setCanHide:NO];
+
+  ProcessSerialNumber psn = { 0, kCurrentProcess };
+  TransformProcessType(&psn, kProcessTransformToUIElementApplication);
+}
+
+void Browser::DockShow() {
+  ProcessSerialNumber psn = { 0, kCurrentProcess };
+  TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+}
+
+void Browser::DockSetMenu(ui::MenuModel* model) {
+  AtomApplicationDelegate* delegate = (AtomApplicationDelegate*)[NSApp delegate];
+  [delegate setApplicationDockMenu:model];
+}
+
 }  // namespace atom

atom/browser/browser_observer.h

@@ -1,5 +1,5 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #ifndef ATOM_BROWSER_BROWSER_OBSERVER_H_
@@ -11,6 +11,9 @@ namespace atom {
 
 class BrowserObserver {
  public:
+  // The browser is about to close all windows.
+  virtual void OnBeforeQuit(bool* prevent_default) {}
+
   // The browser has closed all windows and will quit.
   virtual void OnWillQuit(bool* prevent_default) {}
 
@@ -18,6 +21,9 @@ class BrowserObserver {
   // method will not be called, instead it will call OnWillQuit.
   virtual void OnWindowAllClosed() {}
 
+  // The browser is quitting.
+  virtual void OnQuit() {}
+
   // The browser has opened a file by double clicking in Finder or dragging the
   // file to the Dock icon. (OS X only)
   virtual void OnOpenFile(bool* prevent_default,

atom/browser/browser_win.cc

@@ -1,17 +1,24 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
 #include "atom/browser/browser.h"
 
+#include <atlbase.h>
+#include <propkey.h>
 #include <windows.h>
+#include <shlobj.h>
+#include <shobjidl.h>
 
 #include "base/base_paths.h"
 #include "base/file_version_info.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/win/win_util.h"
+#include "base/win/windows_version.h"
 #include "atom/common/atom_version.h"
 
 namespace atom {
@@ -33,23 +40,95 @@ BOOL CALLBACK WindowsEnumerationHandler(HWND hwnd, LPARAM param) {
 
 }  // namespace
 
-void Browser::Terminate() {
-  is_quiting_ = true;
-  PostQuitMessage(0);
-}
-
 void Browser::Focus() {
   // On Windows we just focus on the first window found for this process.
   DWORD pid = GetCurrentProcessId();
   EnumWindows(&WindowsEnumerationHandler, reinterpret_cast<LPARAM>(&pid));
 }
 
+void Browser::AddRecentDocument(const base::FilePath& path) {
+  if (base::win::GetVersion() < base::win::VERSION_WIN7)
+    return;
+
+  CComPtr<IShellItem> item;
+  HRESULT hr = SHCreateItemFromParsingName(
+      path.value().c_str(), NULL, IID_PPV_ARGS(&item));
+  if (SUCCEEDED(hr)) {
+    SHARDAPPIDINFO info;
+    info.psi = item;
+    info.pszAppID = app_user_model_id_.c_str();
+    SHAddToRecentDocs(SHARD_APPIDINFO, &info);
+  }
+}
+
+void Browser::ClearRecentDocuments() {
+  CComPtr<IApplicationDestinations> destinations;
+  if (FAILED(destinations.CoCreateInstance(CLSID_ApplicationDestinations,
+                                           NULL, CLSCTX_INPROC_SERVER)))
+    return;
+  if (FAILED(destinations->SetAppID(app_user_model_id_.c_str())))
+    return;
+  destinations->RemoveAllDestinations();
+}
+
+void Browser::SetUserTasks(const std::vector<UserTask>& tasks) {
+  CComPtr<ICustomDestinationList> destinations;
+  if (FAILED(destinations.CoCreateInstance(CLSID_DestinationList)))
+    return;
+  if (FAILED(destinations->SetAppID(app_user_model_id_.c_str())))
+    return;
+
+  // Start a transaction that updates the JumpList of this application.
+  UINT max_slots;
+  CComPtr<IObjectArray> removed;
+  if (FAILED(destinations->BeginList(&max_slots, IID_PPV_ARGS(&removed))))
+    return;
+
+  CComPtr<IObjectCollection> collection;
+  if (FAILED(collection.CoCreateInstance(CLSID_EnumerableObjectCollection)))
+    return;
+
+  for (auto& task : tasks) {
+    CComPtr<IShellLink> link;
+    if (FAILED(link.CoCreateInstance(CLSID_ShellLink)) ||
+        FAILED(link->SetPath(task.program.value().c_str())) ||
+        FAILED(link->SetArguments(task.arguments.c_str())) ||
+        FAILED(link->SetDescription(task.description.c_str())))
+      return;
+
+    if (!task.icon_path.empty() &&
+        FAILED(link->SetIconLocation(task.icon_path.value().c_str(),
+                                     task.icon_index)))
+      return;
+
+    CComQIPtr<IPropertyStore> property_store = link;
+    if (!base::win::SetStringValueForPropertyStore(property_store, PKEY_Title,
+                                                   task.title.c_str()))
+      return;
+
+    if (FAILED(collection->AddObject(link)))
+      return;
+  }
+
+  // When the list is empty "AddUserTasks" could fail, so we don't check return
+  // value for it.
+  CComQIPtr<IObjectArray> task_array = collection;
+  destinations->AddUserTasks(task_array);
+  destinations->CommitList();
+}
+
+void Browser::SetAppUserModelID(const std::string& name) {
+  app_user_model_id_ = base::string16(L"atom-shell.app.");
+  app_user_model_id_ += base::UTF8ToUTF16(name);
+  SetCurrentProcessExplicitAppUserModelID(app_user_model_id_.c_str());
+}
+
 std::string Browser::GetExecutableFileVersion() const {
   base::FilePath path;
   if (PathService::Get(base::FILE_EXE, &path)) {
     scoped_ptr<FileVersionInfo> version_info(
         FileVersionInfo::CreateFileVersionInfo(path));
-    return UTF16ToUTF8(version_info->product_version());
+    return base::UTF16ToUTF8(version_info->product_version());
   }
 
   return ATOM_VERSION_STRING;
@@ -60,14 +139,10 @@ std::string Browser::GetExecutableFileProductName() const {
   if (PathService::Get(base::FILE_EXE, &path)) {
     scoped_ptr<FileVersionInfo> version_info(
         FileVersionInfo::CreateFileVersionInfo(path));
-    return UTF16ToUTF8(version_info->product_name());
+    return base::UTF16ToUTF8(version_info->product_name());
   }
 
   return "Atom-Shell";
 }
 
-void Browser::CancelQuit() {
-  // TODO(zcbenz): Research on how to cancel shutdown in Windows.
-}
-
 }  // namespace atom