diff --git a/atom.gyp b/atom.gyp index 84d2fb910..a6ca448d7 100644 --- a/atom.gyp +++ b/atom.gyp @@ -4,225 +4,225 @@ 'product_name': 'Atom', 'framework_name': 'Atom Framework', 'app_sources': [ - 'app/atom_main.cc', - 'app/atom_main.h', + 'atom/app/atom_main.cc', + 'atom/app/atom_main.h', ], 'bundle_sources': [ - 'browser/resources/mac/atom.icns', + 'atom/browser/resources/mac/atom.icns', ], 'coffee_sources': [ - 'browser/api/lib/app.coffee', - 'browser/api/lib/atom-delegate.coffee', - 'browser/api/lib/auto-updater.coffee', - 'browser/api/lib/browser-window.coffee', - 'browser/api/lib/dialog.coffee', - 'browser/api/lib/ipc.coffee', - 'browser/api/lib/menu.coffee', - 'browser/api/lib/menu-item.coffee', - 'browser/api/lib/power-monitor.coffee', - 'browser/api/lib/protocol.coffee', - 'browser/lib/init.coffee', - 'browser/lib/objects-registry.coffee', - 'browser/lib/rpc-server.coffee', - 'common/api/lib/callbacks-registry.coffee', - 'common/api/lib/clipboard.coffee', - 'common/api/lib/crash-reporter.coffee', - 'common/api/lib/id-weak-map.coffee', - 'common/api/lib/screen.coffee', - 'common/api/lib/shell.coffee', - 'common/lib/init.coffee', - 'renderer/lib/init.coffee', - 'renderer/lib/override.coffee', - 'renderer/api/lib/ipc.coffee', - 'renderer/api/lib/remote.coffee', + 'atom/browser/api/lib/app.coffee', + '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/dialog.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/lib/init.coffee', + 'atom/browser/lib/objects-registry.coffee', + 'atom/browser/lib/rpc-server.coffee', + 'atom/common/api/lib/callbacks-registry.coffee', + '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/shell.coffee', + 'atom/common/lib/init.coffee', + 'atom/renderer/lib/init.coffee', + 'atom/renderer/lib/override.coffee', + 'atom/renderer/api/lib/ipc.coffee', + 'atom/renderer/api/lib/remote.coffee', ], 'lib_sources': [ - 'app/atom_main_delegate.cc', - 'app/atom_main_delegate.h', - 'app/atom_main_delegate_mac.mm', - 'browser/api/atom_api_app.cc', - 'browser/api/atom_api_app.h', - 'browser/api/atom_api_auto_updater.cc', - 'browser/api/atom_api_auto_updater.h', - 'browser/api/atom_api_browser_ipc.cc', - 'browser/api/atom_api_browser_ipc.h', - 'browser/api/atom_api_dialog.cc', - 'browser/api/atom_api_dialog.h', - 'browser/api/atom_api_event.cc', - 'browser/api/atom_api_event.h', - 'browser/api/atom_api_menu.cc', - 'browser/api/atom_api_menu.h', - 'browser/api/atom_api_menu_gtk.cc', - 'browser/api/atom_api_menu_gtk.h', - 'browser/api/atom_api_menu_mac.h', - 'browser/api/atom_api_menu_mac.mm', - 'browser/api/atom_api_menu_win.cc', - 'browser/api/atom_api_menu_win.h', - 'browser/api/atom_api_power_monitor.cc', - 'browser/api/atom_api_power_monitor.h', - 'browser/api/atom_api_protocol.cc', - 'browser/api/atom_api_protocol.h', - 'browser/api/atom_api_window.cc', - 'browser/api/atom_api_window.h', - 'browser/api/atom_browser_bindings.cc', - 'browser/api/atom_browser_bindings.h', - 'browser/auto_updater.cc', - 'browser/auto_updater.h', - 'browser/auto_updater_delegate.h', - 'browser/auto_updater_linux.cc', - 'browser/auto_updater_mac.mm', - 'browser/auto_updater_win.cc', - 'browser/atom_application_mac.h', - 'browser/atom_application_mac.mm', - 'browser/atom_application_delegate_mac.h', - 'browser/atom_application_delegate_mac.mm', - 'browser/atom_browser_client.cc', - 'browser/atom_browser_client.h', - 'browser/atom_browser_context.cc', - 'browser/atom_browser_context.h', - 'browser/atom_browser_main_parts.cc', - 'browser/atom_browser_main_parts.h', - 'browser/atom_browser_main_parts_mac.mm', - 'browser/atom_javascript_dialog_manager.cc', - 'browser/atom_javascript_dialog_manager.h', - 'browser/browser.cc', - 'browser/browser.h', - 'browser/browser_linux.cc', - 'browser/browser_mac.mm', - 'browser/browser_win.cc', - 'browser/browser_observer.h', - 'browser/devtools_delegate.cc', - 'browser/devtools_delegate.h', - 'browser/native_window.cc', - 'browser/native_window.h', - 'browser/native_window_gtk.cc', - 'browser/native_window_gtk.h', - 'browser/native_window_mac.h', - 'browser/native_window_mac.mm', - 'browser/native_window_win.cc', - 'browser/native_window_win.h', - 'browser/native_window_observer.h', - 'browser/net/adapter_request_job.cc', - 'browser/net/adapter_request_job.h', - 'browser/net/atom_url_request_context_getter.cc', - 'browser/net/atom_url_request_context_getter.h', - 'browser/net/atom_url_request_job_factory.cc', - 'browser/net/atom_url_request_job_factory.h', - 'browser/net/url_request_string_job.cc', - 'browser/net/url_request_string_job.h', - 'browser/ui/accelerator_util.cc', - 'browser/ui/accelerator_util.h', - 'browser/ui/accelerator_util_gtk.cc', - 'browser/ui/accelerator_util_mac.mm', - 'browser/ui/accelerator_util_win.cc', - 'browser/ui/cocoa/atom_menu_controller.h', - 'browser/ui/cocoa/atom_menu_controller.mm', - 'browser/ui/cocoa/event_processing_window.h', - 'browser/ui/cocoa/event_processing_window.mm', - 'browser/ui/file_dialog.h', - 'browser/ui/file_dialog_gtk.cc', - 'browser/ui/file_dialog_mac.mm', - 'browser/ui/file_dialog_win.cc', - 'browser/ui/gtk/gtk_custom_menu.cc', - 'browser/ui/gtk/gtk_custom_menu.h', - 'browser/ui/gtk/gtk_custom_menu_item.cc', - 'browser/ui/gtk/gtk_custom_menu_item.h', - 'browser/ui/gtk/gtk_util.cc', - 'browser/ui/gtk/gtk_util.h', - 'browser/ui/gtk/gtk_window_util.cc', - 'browser/ui/gtk/gtk_window_util.h', - 'browser/ui/gtk/event_utils.cc', - 'browser/ui/gtk/event_utils.h', - 'browser/ui/gtk/menu_gtk.cc', - 'browser/ui/gtk/menu_gtk.h', - 'browser/ui/message_box.h', - 'browser/ui/message_box_gtk.cc', - 'browser/ui/message_box_mac.mm', - 'browser/ui/message_box_win.cc', - 'browser/ui/win/menu_2.cc', - 'browser/ui/win/menu_2.h', - 'browser/ui/win/native_menu_win.cc', - 'browser/ui/win/native_menu_win.h', - 'browser/window_list.cc', - 'browser/window_list.h', - 'browser/window_list_observer.h', - 'common/api/api_messages.cc', - 'common/api/api_messages.h', - 'common/api/atom_api_clipboard.cc', - 'common/api/atom_api_clipboard.h', - 'common/api/atom_api_crash_reporter.cc', - 'common/api/atom_api_crash_reporter.h', - 'common/api/atom_api_event_emitter.cc', - 'common/api/atom_api_event_emitter.h', - 'common/api/atom_api_id_weak_map.cc', - 'common/api/atom_api_id_weak_map.h', - 'common/api/atom_api_screen.cc', - 'common/api/atom_api_screen.h', - 'common/api/atom_api_shell.cc', - 'common/api/atom_api_shell.h', - 'common/api/atom_api_v8_util.cc', - 'common/api/atom_bindings.cc', - 'common/api/atom_bindings.h', - 'common/api/atom_extensions.cc', - 'common/api/atom_extensions.h', - 'common/api/object_life_monitor.cc', - 'common/api/object_life_monitor.h', - 'common/crash_reporter/crash_reporter.cc', - 'common/crash_reporter/crash_reporter.h', - 'common/crash_reporter/crash_reporter_linux.cc', - 'common/crash_reporter/crash_reporter_linux.h', - 'common/crash_reporter/crash_reporter_mac.h', - 'common/crash_reporter/crash_reporter_mac.mm', - 'common/crash_reporter/crash_reporter_win.cc', - 'common/crash_reporter/crash_reporter_win.h', - 'common/crash_reporter/linux/crash_dump_handler.cc', - 'common/crash_reporter/linux/crash_dump_handler.h', - 'common/crash_reporter/win/crash_service.cc', - 'common/crash_reporter/win/crash_service.h', - 'common/crash_reporter/win/crash_service_main.cc', - 'common/crash_reporter/win/crash_service_main.h', - 'common/draggable_region.cc', - 'common/draggable_region.h', - 'common/linux/application_info.cc', - 'common/node_bindings.cc', - 'common/node_bindings.h', - 'common/node_bindings_linux.cc', - 'common/node_bindings_linux.h', - 'common/node_bindings_mac.cc', - 'common/node_bindings_mac.h', - 'common/node_bindings_win.cc', - 'common/node_bindings_win.h', - 'common/options_switches.cc', - 'common/options_switches.h', - 'common/platform_util.h', - 'common/platform_util_linux.cc', - 'common/platform_util_mac.mm', - 'common/platform_util_win.cc', - 'common/swap_or_assign.h', - 'common/v8/node_common.h', - 'common/v8/scoped_persistent.h', - 'common/v8/native_type_conversions.h', - 'common/v8/v8_value_converter.cc', - 'common/v8/v8_value_converter.h', - 'renderer/api/atom_api_renderer_ipc.cc', - 'renderer/api/atom_api_renderer_ipc.h', - 'renderer/api/atom_renderer_bindings.cc', - 'renderer/api/atom_renderer_bindings.h', - 'renderer/atom_render_view_observer.cc', - 'renderer/atom_render_view_observer.h', - 'renderer/atom_renderer_client.cc', - 'renderer/atom_renderer_client.h', + 'atom/app/atom_main_delegate.cc', + 'atom/app/atom_main_delegate.h', + 'atom/app/atom_main_delegate_mac.mm', + 'atom/browser/api/atom_api_app.cc', + '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_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_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_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_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/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_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_mac.mm', + 'atom/browser/atom_javascript_dialog_manager.cc', + 'atom/browser/atom_javascript_dialog_manager.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/native_window.cc', + 'atom/browser/native_window.h', + 'atom/browser/native_window_gtk.cc', + 'atom/browser/native_window_gtk.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/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/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/cocoa/atom_menu_controller.h', + 'atom/browser/ui/cocoa/atom_menu_controller.mm', + 'atom/browser/ui/cocoa/event_processing_window.h', + 'atom/browser/ui/cocoa/event_processing_window.mm', + 'atom/browser/ui/file_dialog.h', + 'atom/browser/ui/file_dialog_gtk.cc', + 'atom/browser/ui/file_dialog_mac.mm', + 'atom/browser/ui/file_dialog_win.cc', + 'atom/browser/ui/gtk/gtk_custom_menu.cc', + 'atom/browser/ui/gtk/gtk_custom_menu.h', + 'atom/browser/ui/gtk/gtk_custom_menu_item.cc', + 'atom/browser/ui/gtk/gtk_custom_menu_item.h', + 'atom/browser/ui/gtk/gtk_util.cc', + 'atom/browser/ui/gtk/gtk_util.h', + 'atom/browser/ui/gtk/gtk_window_util.cc', + 'atom/browser/ui/gtk/gtk_window_util.h', + 'atom/browser/ui/gtk/event_utils.cc', + 'atom/browser/ui/gtk/event_utils.h', + 'atom/browser/ui/gtk/menu_gtk.cc', + 'atom/browser/ui/gtk/menu_gtk.h', + '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/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_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_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/crash_reporter/crash_reporter.cc', + 'atom/common/crash_reporter/crash_reporter.h', + 'atom/common/crash_reporter/crash_reporter_linux.cc', + 'atom/common/crash_reporter/crash_reporter_linux.h', + 'atom/common/crash_reporter/crash_reporter_mac.h', + 'atom/common/crash_reporter/crash_reporter_mac.mm', + 'atom/common/crash_reporter/crash_reporter_win.cc', + 'atom/common/crash_reporter/crash_reporter_win.h', + 'atom/common/crash_reporter/linux/crash_dump_handler.cc', + 'atom/common/crash_reporter/linux/crash_dump_handler.h', + 'atom/common/crash_reporter/win/crash_service.cc', + 'atom/common/crash_reporter/win/crash_service.h', + 'atom/common/crash_reporter/win/crash_service_main.cc', + 'atom/common/crash_reporter/win/crash_service_main.h', + 'atom/common/draggable_region.cc', + 'atom/common/draggable_region.h', + 'atom/common/linux/application_info.cc', + 'atom/common/node_bindings.cc', + 'atom/common/node_bindings.h', + 'atom/common/node_bindings_linux.cc', + 'atom/common/node_bindings_linux.h', + 'atom/common/node_bindings_mac.cc', + 'atom/common/node_bindings_mac.h', + 'atom/common/node_bindings_win.cc', + 'atom/common/node_bindings_win.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/atom_render_view_observer.cc', + 'atom/renderer/atom_render_view_observer.h', + 'atom/renderer/atom_renderer_client.cc', + 'atom/renderer/atom_renderer_client.h', ], 'framework_sources': [ - 'app/atom_library_main.cc', - 'app/atom_library_main.h', + 'atom/app/atom_library_main.cc', + 'atom/app/atom_library_main.h', ], 'conditions': [ ['OS=="win"', { 'app_sources': [ - 'browser/resources/win/resource.h', - 'browser/resources/win/atom.ico', - 'browser/resources/win/atom.rc', + 'atom/browser/resources/win/resource.h', + 'atom/browser/resources/win/atom.ico', + 'atom/browser/resources/win/atom.rc', '<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc', ], }], # OS=="win" @@ -270,7 +270,7 @@ '<(project_name)_helper', ], 'xcode_settings': { - 'INFOPLIST_FILE': 'browser/resources/mac/Info.plist', + 'INFOPLIST_FILE': 'atom/browser/resources/mac/Info.plist', 'LD_RUNPATH_SEARCH_PATHS': [ '@executable_path/../Frameworks', ], @@ -292,7 +292,7 @@ { 'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources/browser', 'files': [ - 'browser/default_app', + 'atom/browser/default_app', ], }, ], @@ -330,7 +330,7 @@ { 'destination': '<(PRODUCT_DIR)/resources/browser', 'files': [ - 'browser/default_app', + 'atom/browser/default_app', ] }, ], @@ -348,7 +348,7 @@ { 'destination': '<(PRODUCT_DIR)/resources/browser', 'files': [ - 'browser/default_app', + 'atom/browser/default_app', ] }, ], @@ -600,11 +600,11 @@ }, 'mac_bundle': 1, 'mac_bundle_resources': [ - 'common/resources/mac/MainMenu.xib', + 'atom/common/resources/mac/MainMenu.xib', '<(libchromiumcontent_resources_dir)/content_shell.pak', ], 'xcode_settings': { - 'INFOPLIST_FILE': 'common/resources/mac/Info.plist', + 'INFOPLIST_FILE': 'atom/common/resources/mac/Info.plist', 'LIBRARY_SEARCH_PATHS': [ '<(libchromiumcontent_library_dir)', ], @@ -659,7 +659,7 @@ ], 'mac_bundle': 1, 'xcode_settings': { - 'INFOPLIST_FILE': 'renderer/resources/mac/Info.plist', + 'INFOPLIST_FILE': 'atom/renderer/resources/mac/Info.plist', 'LD_RUNPATH_SEARCH_PATHS': [ '@executable_path/../../..', ], diff --git a/app/atom_library_main.cc b/atom/app/atom_library_main.cc similarity index 82% rename from app/atom_library_main.cc rename to atom/app/atom_library_main.cc index 6b78a63bf..d7571e0ea 100644 --- a/app/atom_library_main.cc +++ b/atom/app/atom_library_main.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/atom_library_main.h" +#include "atom/app/atom_library_main.h" -#include "app/atom_main_delegate.h" +#include "atom/app/atom_main_delegate.h" #include "content/public/app/content_main.h" #if defined(OS_MACOSX) diff --git a/app/atom_library_main.h b/atom/app/atom_library_main.h similarity index 100% rename from app/atom_library_main.h rename to atom/app/atom_library_main.h diff --git a/app/atom_main.cc b/atom/app/atom_main.cc similarity index 94% rename from app/atom_main.cc rename to atom/app/atom_main.cc index 619138618..622cf978e 100644 --- a/app/atom_main.cc +++ b/atom/app/atom_main.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/atom_main.h" +#include "atom/app/atom_main.h" #include #include @@ -15,16 +15,16 @@ #include #include -#include "app/atom_main_delegate.h" +#include "atom/app/atom_main_delegate.h" #include "base/environment.h" -#include "common/crash_reporter/win/crash_service_main.h" +#include "atom/common/crash_reporter/win/crash_service_main.h" #include "content/public/app/startup_helper_win.h" #include "sandbox/win/src/sandbox_types.h" #elif defined(OS_LINUX) // defined(OS_WIN) -#include "app/atom_main_delegate.h" // NOLINT +#include "atom/app/atom_main_delegate.h" // NOLINT #include "content/public/app/content_main.h" #else // defined(OS_LINUX) -#include "app/atom_library_main.h" +#include "atom/app/atom_library_main.h" #endif // defined(OS_MACOSX) // Declaration of node::Start. diff --git a/app/atom_main.h b/atom/app/atom_main.h similarity index 100% rename from app/atom_main.h rename to atom/app/atom_main.h diff --git a/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc similarity index 95% rename from app/atom_main_delegate.cc rename to atom/app/atom_main_delegate.cc index 6346343b8..576f39571 100644 --- a/app/atom_main_delegate.cc +++ b/atom/app/atom_main_delegate.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/atom_main_delegate.h" +#include "atom/app/atom_main_delegate.h" #include "base/command_line.h" #include "base/debug/stack_trace.h" #include "base/logging.h" -#include "browser/atom_browser_client.h" +#include "atom/browser/atom_browser_client.h" #include "content/public/common/content_switches.h" -#include "renderer/atom_renderer_client.h" +#include "atom/renderer/atom_renderer_client.h" #include "ui/base/resource/resource_bundle.h" #include "base/path_service.h" diff --git a/app/atom_main_delegate.h b/atom/app/atom_main_delegate.h similarity index 100% rename from app/atom_main_delegate.h rename to atom/app/atom_main_delegate.h diff --git a/app/atom_main_delegate_mac.mm b/atom/app/atom_main_delegate_mac.mm similarity index 97% rename from app/atom_main_delegate_mac.mm rename to atom/app/atom_main_delegate_mac.mm index d9ddb4d93..0b95d36b8 100644 --- a/app/atom_main_delegate_mac.mm +++ b/atom/app/atom_main_delegate_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/atom_main_delegate.h" +#include "atom/app/atom_main_delegate.h" #import "base/mac/bundle_locations.h" #import "base/mac/foundation_util.h" diff --git a/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc similarity index 97% rename from browser/api/atom_api_app.cc rename to atom/browser/api/atom_api_app.cc index d07c387ba..f5b183820 100644 --- a/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_app.h" +#include "atom/browser/api/atom_api_app.h" #include "base/values.h" #include "base/command_line.h" -#include "browser/browser.h" -#include "common/v8/native_type_conversions.h" +#include "atom/browser/browser.h" +#include "atom/common/v8/native_type_conversions.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h similarity index 96% rename from browser/api/atom_api_app.h rename to atom/browser/api/atom_api_app.h index 9d3eccff1..4fed94365 100644 --- a/browser/api/atom_api_app.h +++ b/atom/browser/api/atom_api_app.h @@ -6,8 +6,8 @@ #define ATOM_BROWSER_API_ATOM_API_APP_H_ #include "base/compiler_specific.h" -#include "browser/browser_observer.h" -#include "common/api/atom_api_event_emitter.h" +#include "atom/browser/browser_observer.h" +#include "atom/common/api/atom_api_event_emitter.h" namespace atom { diff --git a/browser/api/atom_api_auto_updater.cc b/atom/browser/api/atom_api_auto_updater.cc similarity index 93% rename from browser/api/atom_api_auto_updater.cc rename to atom/browser/api/atom_api_auto_updater.cc index 6375e19a9..1ed8588e4 100644 --- a/browser/api/atom_api_auto_updater.cc +++ b/atom/browser/api/atom_api_auto_updater.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_auto_updater.h" +#include "atom/browser/api/atom_api_auto_updater.h" #include "base/time/time.h" #include "base/values.h" -#include "browser/auto_updater.h" -#include "common/v8/native_type_conversions.h" +#include "atom/browser/auto_updater.h" +#include "atom/common/v8/native_type_conversions.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/browser/api/atom_api_auto_updater.h b/atom/browser/api/atom_api_auto_updater.h similarity index 94% rename from browser/api/atom_api_auto_updater.h rename to atom/browser/api/atom_api_auto_updater.h index 0207cbe6a..9007bbd98 100644 --- a/browser/api/atom_api_auto_updater.h +++ b/atom/browser/api/atom_api_auto_updater.h @@ -7,8 +7,8 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" -#include "browser/auto_updater_delegate.h" -#include "common/api/atom_api_event_emitter.h" +#include "atom/browser/auto_updater_delegate.h" +#include "atom/common/api/atom_api_event_emitter.h" namespace atom { diff --git a/browser/api/atom_api_browser_ipc.cc b/atom/browser/api/atom_api_browser_ipc.cc similarity index 86% rename from browser/api/atom_api_browser_ipc.cc rename to atom/browser/api/atom_api_browser_ipc.cc index 024bfffe5..2d0624214 100644 --- a/browser/api/atom_api_browser_ipc.cc +++ b/atom/browser/api/atom_api_browser_ipc.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_browser_ipc.h" +#include "atom/browser/api/atom_api_browser_ipc.h" -#include "common/api/api_messages.h" -#include "common/v8/node_common.h" -#include "common/v8/native_type_conversions.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; diff --git a/browser/api/atom_api_browser_ipc.h b/atom/browser/api/atom_api_browser_ipc.h similarity index 100% rename from browser/api/atom_api_browser_ipc.h rename to atom/browser/api/atom_api_browser_ipc.h diff --git a/browser/api/atom_api_dialog.cc b/atom/browser/api/atom_api_dialog.cc similarity index 93% rename from browser/api/atom_api_dialog.cc rename to atom/browser/api/atom_api_dialog.cc index 2eb555ccd..b35849367 100644 --- a/browser/api/atom_api_dialog.cc +++ b/atom/browser/api/atom_api_dialog.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_dialog.h" +#include "atom/browser/api/atom_api_dialog.h" #include "base/bind.h" -#include "browser/native_window.h" -#include "browser/ui/file_dialog.h" -#include "browser/ui/message_box.h" -#include "common/v8/node_common.h" -#include "common/v8/native_type_conversions.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" namespace atom { diff --git a/browser/api/atom_api_dialog.h b/atom/browser/api/atom_api_dialog.h similarity index 100% rename from browser/api/atom_api_dialog.h rename to atom/browser/api/atom_api_dialog.h diff --git a/browser/api/atom_api_event.cc b/atom/browser/api/atom_api_event.cc similarity index 91% rename from browser/api/atom_api_event.cc rename to atom/browser/api/atom_api_event.cc index 155fdbbeb..ec074bb28 100644 --- a/browser/api/atom_api_event.cc +++ b/atom/browser/api/atom_api_event.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_event.h" +#include "atom/browser/api/atom_api_event.h" -#include "browser/native_window.h" -#include "common/api/api_messages.h" -#include "common/v8/node_common.h" -#include "common/v8/native_type_conversions.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 { diff --git a/browser/api/atom_api_event.h b/atom/browser/api/atom_api_event.h similarity index 94% rename from browser/api/atom_api_event.h rename to atom/browser/api/atom_api_event.h index 1a46f052c..298efde22 100644 --- a/browser/api/atom_api_event.h +++ b/atom/browser/api/atom_api_event.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/strings/string16.h" -#include "browser/native_window_observer.h" -#include "common/v8/scoped_persistent.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 { diff --git a/browser/api/atom_api_menu.cc b/atom/browser/api/atom_api_menu.cc similarity index 98% rename from browser/api/atom_api_menu.cc rename to atom/browser/api/atom_api_menu.cc index 406782916..392b8fa72 100644 --- a/browser/api/atom_api_menu.cc +++ b/atom/browser/api/atom_api_menu.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_menu.h" +#include "atom/browser/api/atom_api_menu.h" -#include "browser/ui/accelerator_util.h" -#include "common/v8/node_common.h" -#include "common/v8/native_type_conversions.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(args.This()); \ diff --git a/browser/api/atom_api_menu.h b/atom/browser/api/atom_api_menu.h similarity index 98% rename from browser/api/atom_api_menu.h rename to atom/browser/api/atom_api_menu.h index 25f94b835..037a473ec 100644 --- a/browser/api/atom_api_menu.h +++ b/atom/browser/api/atom_api_menu.h @@ -6,7 +6,7 @@ #define ATOM_BROWSER_API_ATOM_API_MENU_H_ #include "base/memory/scoped_ptr.h" -#include "common/api/atom_api_event_emitter.h" +#include "atom/common/api/atom_api_event_emitter.h" #include "ui/base/models/simple_menu_model.h" namespace atom { diff --git a/browser/api/atom_api_menu_gtk.cc b/atom/browser/api/atom_api_menu_gtk.cc similarity index 89% rename from browser/api/atom_api_menu_gtk.cc rename to atom/browser/api/atom_api_menu_gtk.cc index a28e9217b..0265ac74a 100644 --- a/browser/api/atom_api_menu_gtk.cc +++ b/atom/browser/api/atom_api_menu_gtk.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_menu_gtk.h" +#include "atom/browser/api/atom_api_menu_gtk.h" -#include "browser/native_window_gtk.h" -#include "common/v8/native_type_conversions.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 "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/browser/api/atom_api_menu_gtk.h b/atom/browser/api/atom_api_menu_gtk.h similarity index 88% rename from browser/api/atom_api_menu_gtk.h rename to atom/browser/api/atom_api_menu_gtk.h index 9f1768290..51c82d8da 100644 --- a/browser/api/atom_api_menu_gtk.h +++ b/atom/browser/api/atom_api_menu_gtk.h @@ -5,8 +5,8 @@ #ifndef ATOM_BROWSER_API_ATOM_API_MENU_GTK_H_ #define ATOM_BROWSER_API_ATOM_API_MENU_GTK_H_ -#include "browser/api/atom_api_menu.h" -#include "browser/ui/gtk/menu_gtk.h" +#include "atom/browser/api/atom_api_menu.h" +#include "atom/browser/ui/gtk/menu_gtk.h" namespace atom { diff --git a/browser/api/atom_api_menu_mac.h b/atom/browser/api/atom_api_menu_mac.h similarity index 89% rename from browser/api/atom_api_menu_mac.h rename to atom/browser/api/atom_api_menu_mac.h index 62da458ae..3abd34e1e 100644 --- a/browser/api/atom_api_menu_mac.h +++ b/atom/browser/api/atom_api_menu_mac.h @@ -5,9 +5,9 @@ #ifndef ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_ #define ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_ -#include "browser/api/atom_api_menu.h" +#include "atom/browser/api/atom_api_menu.h" -#import "browser/ui/cocoa/atom_menu_controller.h" +#import "atom/browser/ui/cocoa/atom_menu_controller.h" namespace atom { diff --git a/browser/api/atom_api_menu_mac.mm b/atom/browser/api/atom_api_menu_mac.mm similarity index 95% rename from browser/api/atom_api_menu_mac.mm rename to atom/browser/api/atom_api_menu_mac.mm index 12e271060..fa2a708d6 100644 --- a/browser/api/atom_api_menu_mac.mm +++ b/atom/browser/api/atom_api_menu_mac.mm @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "browser/api/atom_api_menu_mac.h" +#import "atom/browser/api/atom_api_menu_mac.h" #include "base/mac/scoped_sending_event.h" #include "base/message_loop/message_loop.h" #include "base/strings/sys_string_conversions.h" -#include "browser/native_window.h" -#include "common/v8/node_common.h" -#include "common/v8/native_type_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" diff --git a/browser/api/atom_api_menu_win.cc b/atom/browser/api/atom_api_menu_win.cc similarity index 83% rename from browser/api/atom_api_menu_win.cc rename to atom/browser/api/atom_api_menu_win.cc index e645478ac..d5d820e09 100644 --- a/browser/api/atom_api_menu_win.cc +++ b/atom/browser/api/atom_api_menu_win.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_menu_win.h" +#include "atom/browser/api/atom_api_menu_win.h" -#include "browser/native_window_win.h" -#include "browser/ui/win/menu_2.h" -#include "common/v8/native_type_conversions.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 "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/browser/api/atom_api_menu_win.h b/atom/browser/api/atom_api_menu_win.h similarity index 93% rename from browser/api/atom_api_menu_win.h rename to atom/browser/api/atom_api_menu_win.h index dbc09dfa0..f3cb60771 100644 --- a/browser/api/atom_api_menu_win.h +++ b/atom/browser/api/atom_api_menu_win.h @@ -5,7 +5,7 @@ #ifndef ATOM_BROWSER_API_ATOM_API_MENU_WIN_H_ #define ATOM_BROWSER_API_ATOM_API_MENU_WIN_H_ -#include "browser/api/atom_api_menu.h" +#include "atom/browser/api/atom_api_menu.h" namespace atom { diff --git a/browser/api/atom_api_power_monitor.cc b/atom/browser/api/atom_api_power_monitor.cc similarity index 94% rename from browser/api/atom_api_power_monitor.cc rename to atom/browser/api/atom_api_power_monitor.cc index 1dd362bc6..d045c1866 100644 --- a/browser/api/atom_api_power_monitor.cc +++ b/atom/browser/api/atom_api_power_monitor.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_power_monitor.h" +#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 "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/browser/api/atom_api_power_monitor.h b/atom/browser/api/atom_api_power_monitor.h similarity index 95% rename from browser/api/atom_api_power_monitor.h rename to atom/browser/api/atom_api_power_monitor.h index 3febb438a..98b9ee3ef 100644 --- a/browser/api/atom_api_power_monitor.h +++ b/atom/browser/api/atom_api_power_monitor.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/power_monitor/power_observer.h" -#include "common/api/atom_api_event_emitter.h" +#include "atom/common/api/atom_api_event_emitter.h" namespace atom { diff --git a/browser/api/atom_api_protocol.cc b/atom/browser/api/atom_api_protocol.cc similarity index 97% rename from browser/api/atom_api_protocol.cc rename to atom/browser/api/atom_api_protocol.cc index 7c44f81d4..60c7b8cb6 100644 --- a/browser/api/atom_api_protocol.cc +++ b/atom/browser/api/atom_api_protocol.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_protocol.h" +#include "atom/browser/api/atom_api_protocol.h" #include "base/stl_util.h" -#include "browser/atom_browser_context.h" -#include "browser/net/adapter_request_job.h" -#include "browser/net/atom_url_request_context_getter.h" -#include "browser/net/atom_url_request_job_factory.h" -#include "common/v8/native_type_conversions.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 "content/public/browser/browser_thread.h" #include "net/url_request/url_request_context.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/browser/api/atom_api_protocol.h b/atom/browser/api/atom_api_protocol.h similarity index 100% rename from browser/api/atom_api_protocol.h rename to atom/browser/api/atom_api_protocol.h diff --git a/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc similarity index 99% rename from browser/api/atom_api_window.cc rename to atom/browser/api/atom_api_window.cc index 7486f4f5b..e44f26a6b 100644 --- a/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_api_window.h" +#include "atom/browser/api/atom_api_window.h" #include "base/bind.h" #include "base/process/kill.h" -#include "browser/native_window.h" -#include "common/v8/native_type_conversions.h" +#include "atom/browser/native_window.h" +#include "atom/common/v8/native_type_conversions.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/render_process_host.h" #include "ui/gfx/point.h" #include "ui/gfx/size.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" #include "vendor/node/src/node_buffer.h" using content::NavigationController; diff --git a/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h similarity index 97% rename from browser/api/atom_api_window.h rename to atom/browser/api/atom_api_window.h index d53affaa7..75149ea00 100644 --- a/browser/api/atom_api_window.h +++ b/atom/browser/api/atom_api_window.h @@ -8,9 +8,9 @@ #include #include "base/memory/scoped_ptr.h" -#include "browser/native_window_observer.h" -#include "common/api/atom_api_event_emitter.h" -#include "common/v8/scoped_persistent.h" +#include "atom/browser/native_window_observer.h" +#include "atom/common/api/atom_api_event_emitter.h" +#include "atom/common/v8/scoped_persistent.h" namespace base { class DictionaryValue; diff --git a/browser/api/atom_browser_bindings.cc b/atom/browser/api/atom_browser_bindings.cc similarity index 93% rename from browser/api/atom_browser_bindings.cc rename to atom/browser/api/atom_browser_bindings.cc index a7753f77a..825fefa62 100644 --- a/browser/api/atom_browser_bindings.cc +++ b/atom/browser/api/atom_browser_bindings.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/api/atom_browser_bindings.h" +#include "atom/browser/api/atom_browser_bindings.h" #include #include "base/logging.h" -#include "browser/api/atom_api_event.h" -#include "common/v8/native_type_conversions.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 "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/browser/api/atom_browser_bindings.h b/atom/browser/api/atom_browser_bindings.h similarity index 93% rename from browser/api/atom_browser_bindings.h rename to atom/browser/api/atom_browser_bindings.h index 004518cc6..4aedcd5a2 100644 --- a/browser/api/atom_browser_bindings.h +++ b/atom/browser/api/atom_browser_bindings.h @@ -6,8 +6,8 @@ #define ATOM_BROWSER_API_ATOM_BROWSER_BINDINGS_ #include "base/strings/string16.h" -#include "common/api/atom_bindings.h" -#include "common/v8/scoped_persistent.h" +#include "atom/common/api/atom_bindings.h" +#include "atom/common/v8/scoped_persistent.h" namespace base { class ListValue; diff --git a/browser/api/lib/app.coffee b/atom/browser/api/lib/app.coffee similarity index 100% rename from browser/api/lib/app.coffee rename to atom/browser/api/lib/app.coffee diff --git a/browser/api/lib/atom-delegate.coffee b/atom/browser/api/lib/atom-delegate.coffee similarity index 100% rename from browser/api/lib/atom-delegate.coffee rename to atom/browser/api/lib/atom-delegate.coffee diff --git a/browser/api/lib/auto-updater.coffee b/atom/browser/api/lib/auto-updater.coffee similarity index 100% rename from browser/api/lib/auto-updater.coffee rename to atom/browser/api/lib/auto-updater.coffee diff --git a/browser/api/lib/browser-window.coffee b/atom/browser/api/lib/browser-window.coffee similarity index 100% rename from browser/api/lib/browser-window.coffee rename to atom/browser/api/lib/browser-window.coffee diff --git a/browser/api/lib/dialog.coffee b/atom/browser/api/lib/dialog.coffee similarity index 100% rename from browser/api/lib/dialog.coffee rename to atom/browser/api/lib/dialog.coffee diff --git a/browser/api/lib/ipc.coffee b/atom/browser/api/lib/ipc.coffee similarity index 100% rename from browser/api/lib/ipc.coffee rename to atom/browser/api/lib/ipc.coffee diff --git a/browser/api/lib/menu-item.coffee b/atom/browser/api/lib/menu-item.coffee similarity index 100% rename from browser/api/lib/menu-item.coffee rename to atom/browser/api/lib/menu-item.coffee diff --git a/browser/api/lib/menu.coffee b/atom/browser/api/lib/menu.coffee similarity index 100% rename from browser/api/lib/menu.coffee rename to atom/browser/api/lib/menu.coffee diff --git a/browser/api/lib/power-monitor.coffee b/atom/browser/api/lib/power-monitor.coffee similarity index 100% rename from browser/api/lib/power-monitor.coffee rename to atom/browser/api/lib/power-monitor.coffee diff --git a/browser/api/lib/protocol.coffee b/atom/browser/api/lib/protocol.coffee similarity index 100% rename from browser/api/lib/protocol.coffee rename to atom/browser/api/lib/protocol.coffee diff --git a/browser/atom_application_delegate_mac.h b/atom/browser/atom_application_delegate_mac.h similarity index 100% rename from browser/atom_application_delegate_mac.h rename to atom/browser/atom_application_delegate_mac.h diff --git a/browser/atom_application_delegate_mac.mm b/atom/browser/atom_application_delegate_mac.mm similarity index 90% rename from browser/atom_application_delegate_mac.mm rename to atom/browser/atom_application_delegate_mac.mm index 1843298bd..2f5519b7c 100644 --- a/browser/atom_application_delegate_mac.mm +++ b/atom/browser/atom_application_delegate_mac.mm @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "browser/atom_application_delegate_mac.h" +#import "atom/browser/atom_application_delegate_mac.h" #include "base/strings/sys_string_conversions.h" -#import "browser/atom_application_mac.h" -#include "browser/browser.h" +#import "atom/browser/atom_application_mac.h" +#include "atom/browser/browser.h" @implementation AtomApplicationDelegate diff --git a/browser/atom_application_mac.h b/atom/browser/atom_application_mac.h similarity index 100% rename from browser/atom_application_mac.h rename to atom/browser/atom_application_mac.h diff --git a/browser/atom_application_mac.mm b/atom/browser/atom_application_mac.mm similarity index 93% rename from browser/atom_application_mac.mm rename to atom/browser/atom_application_mac.mm index 7cfde6038..6a055b15a 100644 --- a/browser/atom_application_mac.mm +++ b/atom/browser/atom_application_mac.mm @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "browser/atom_application_mac.h" +#import "atom/browser/atom_application_mac.h" #include "base/auto_reset.h" #include "base/strings/sys_string_conversions.h" -#include "browser/browser.h" +#include "atom/browser/browser.h" @implementation AtomApplication diff --git a/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc similarity index 93% rename from browser/atom_browser_client.cc rename to atom/browser/atom_browser_client.cc index d35b81cc8..bd7d95ab4 100644 --- a/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/atom_browser_client.h" +#include "atom/browser/atom_browser_client.h" -#include "browser/atom_browser_context.h" -#include "browser/atom_browser_main_parts.h" -#include "browser/native_window.h" -#include "browser/net/atom_url_request_context_getter.h" -#include "browser/window_list.h" +#include "atom/browser/atom_browser_context.h" +#include "atom/browser/atom_browser_main_parts.h" +#include "atom/browser/native_window.h" +#include "atom/browser/net/atom_url_request_context_getter.h" +#include "atom/browser/window_list.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" diff --git a/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h similarity index 100% rename from browser/atom_browser_client.h rename to atom/browser/atom_browser_client.h diff --git a/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc similarity index 93% rename from browser/atom_browser_context.cc rename to atom/browser/atom_browser_context.cc index 02d6836e7..cbf14c83e 100644 --- a/browser/atom_browser_context.cc +++ b/atom/browser/atom_browser_context.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/atom_browser_context.h" +#include "atom/browser/atom_browser_context.h" -#include "browser/atom_browser_main_parts.h" -#include "browser/net/atom_url_request_context_getter.h" +#include "atom/browser/atom_browser_main_parts.h" +#include "atom/browser/net/atom_url_request_context_getter.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_context.h" #include "vendor/brightray/browser/network_delegate.h" diff --git a/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h similarity index 100% rename from browser/atom_browser_context.h rename to atom/browser/atom_browser_context.h diff --git a/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc similarity index 89% rename from browser/atom_browser_main_parts.cc rename to atom/browser/atom_browser_main_parts.cc index 0cb05dd1a..84f15d620 100644 --- a/browser/atom_browser_main_parts.cc +++ b/atom/browser/atom_browser_main_parts.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/atom_browser_main_parts.h" +#include "atom/browser/atom_browser_main_parts.h" -#include "browser/api/atom_browser_bindings.h" -#include "browser/atom_browser_client.h" -#include "browser/atom_browser_context.h" -#include "browser/browser.h" -#include "common/node_bindings.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/common/node_bindings.h" #include "net/proxy/proxy_resolver_v8.h" #if defined(OS_WIN) #include "ui/gfx/win/dpi.h" #endif -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/browser/atom_browser_main_parts.h b/atom/browser/atom_browser_main_parts.h similarity index 100% rename from browser/atom_browser_main_parts.h rename to atom/browser/atom_browser_main_parts.h diff --git a/browser/atom_browser_main_parts_mac.mm b/atom/browser/atom_browser_main_parts_mac.mm similarity index 90% rename from browser/atom_browser_main_parts_mac.mm rename to atom/browser/atom_browser_main_parts_mac.mm index 4b2c7ab99..2f2614542 100644 --- a/browser/atom_browser_main_parts_mac.mm +++ b/atom/browser/atom_browser_main_parts_mac.mm @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/atom_browser_main_parts.h" +#include "atom/browser/atom_browser_main_parts.h" #include "base/files/file_path.h" #import "base/mac/foundation_util.h" -#import "browser/atom_application_mac.h" -#import "browser/atom_application_delegate_mac.h" +#import "atom/browser/atom_application_mac.h" +#import "atom/browser/atom_application_delegate_mac.h" #import "vendor/brightray/common/mac/main_application_bundle.h" namespace atom { diff --git a/browser/atom_javascript_dialog_manager.cc b/atom/browser/atom_javascript_dialog_manager.cc similarity index 94% rename from browser/atom_javascript_dialog_manager.cc rename to atom/browser/atom_javascript_dialog_manager.cc index 33f131423..dda3f5fd4 100644 --- a/browser/atom_javascript_dialog_manager.cc +++ b/atom/browser/atom_javascript_dialog_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/atom_javascript_dialog_manager.h" +#include "atom/browser/atom_javascript_dialog_manager.h" #include "base/strings/utf_string_conversions.h" diff --git a/browser/atom_javascript_dialog_manager.h b/atom/browser/atom_javascript_dialog_manager.h similarity index 100% rename from browser/atom_javascript_dialog_manager.h rename to atom/browser/atom_javascript_dialog_manager.h diff --git a/browser/auto_updater.cc b/atom/browser/auto_updater.cc similarity index 91% rename from browser/auto_updater.cc rename to atom/browser/auto_updater.cc index ef6f3ad13..a8dc3d889 100644 --- a/browser/auto_updater.cc +++ b/atom/browser/auto_updater.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/auto_updater.h" +#include "atom/browser/auto_updater.h" namespace auto_updater { diff --git a/browser/auto_updater.h b/atom/browser/auto_updater.h similarity index 100% rename from browser/auto_updater.h rename to atom/browser/auto_updater.h diff --git a/browser/auto_updater_delegate.h b/atom/browser/auto_updater_delegate.h similarity index 100% rename from browser/auto_updater_delegate.h rename to atom/browser/auto_updater_delegate.h diff --git a/browser/auto_updater_linux.cc b/atom/browser/auto_updater_linux.cc similarity index 89% rename from browser/auto_updater_linux.cc rename to atom/browser/auto_updater_linux.cc index ccdc4ed8e..12b6e5d53 100644 --- a/browser/auto_updater_linux.cc +++ b/atom/browser/auto_updater_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/auto_updater.h" +#include "atom/browser/auto_updater.h" namespace auto_updater { diff --git a/browser/auto_updater_mac.mm b/atom/browser/auto_updater_mac.mm similarity index 97% rename from browser/auto_updater_mac.mm rename to atom/browser/auto_updater_mac.mm index 290eea5dc..f70862e71 100644 --- a/browser/auto_updater_mac.mm +++ b/atom/browser/auto_updater_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/auto_updater.h" +#include "atom/browser/auto_updater.h" #import #import @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/time/time.h" #include "base/strings/sys_string_conversions.h" -#include "browser/auto_updater_delegate.h" +#include "atom/browser/auto_updater_delegate.h" #include diff --git a/browser/auto_updater_win.cc b/atom/browser/auto_updater_win.cc similarity index 89% rename from browser/auto_updater_win.cc rename to atom/browser/auto_updater_win.cc index ccdc4ed8e..12b6e5d53 100644 --- a/browser/auto_updater_win.cc +++ b/atom/browser/auto_updater_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/auto_updater.h" +#include "atom/browser/auto_updater.h" namespace auto_updater { diff --git a/browser/browser.cc b/atom/browser/browser.cc similarity index 95% rename from browser/browser.cc rename to atom/browser/browser.cc index 6567aea15..954eae24b 100644 --- a/browser/browser.cc +++ b/atom/browser/browser.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/browser.h" +#include "atom/browser/browser.h" -#include "browser/atom_browser_main_parts.h" -#include "browser/window_list.h" +#include "atom/browser/atom_browser_main_parts.h" +#include "atom/browser/window_list.h" namespace atom { diff --git a/browser/browser.h b/atom/browser/browser.h similarity index 96% rename from browser/browser.h rename to atom/browser/browser.h index 759e9680f..80dc5927a 100644 --- a/browser/browser.h +++ b/atom/browser/browser.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/observer_list.h" -#include "browser/browser_observer.h" -#include "browser/window_list_observer.h" +#include "atom/browser/browser_observer.h" +#include "atom/browser/window_list_observer.h" namespace atom { diff --git a/browser/browser_linux.cc b/atom/browser/browser_linux.cc similarity index 84% rename from browser/browser_linux.cc rename to atom/browser/browser_linux.cc index fcff198fc..a62042710 100644 --- a/browser/browser_linux.cc +++ b/atom/browser/browser_linux.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/browser.h" +#include "atom/browser/browser.h" #include -#include "browser/native_window.h" -#include "browser/window_list.h" -#include "common/atom_version.h" +#include "atom/browser/native_window.h" +#include "atom/browser/window_list.h" +#include "atom/common/atom_version.h" namespace atom { diff --git a/browser/browser_mac.mm b/atom/browser/browser_mac.mm similarity index 95% rename from browser/browser_mac.mm rename to atom/browser/browser_mac.mm index 63312f4e6..d88be3ca5 100644 --- a/browser/browser_mac.mm +++ b/atom/browser/browser_mac.mm @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/browser.h" +#include "atom/browser/browser.h" #import "base/mac/bundle_locations.h" #include "base/strings/sys_string_conversions.h" -#import "browser/atom_application_mac.h" +#import "atom/browser/atom_application_mac.h" namespace atom { diff --git a/browser/browser_observer.h b/atom/browser/browser_observer.h similarity index 100% rename from browser/browser_observer.h rename to atom/browser/browser_observer.h diff --git a/browser/browser_win.cc b/atom/browser/browser_win.cc similarity index 96% rename from browser/browser_win.cc rename to atom/browser/browser_win.cc index b065f7078..74953cf09 100644 --- a/browser/browser_win.cc +++ b/atom/browser/browser_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/browser.h" +#include "atom/browser/browser.h" #include @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "common/atom_version.h" +#include "atom/common/atom_version.h" namespace atom { diff --git a/browser/default_app/default_app.js b/atom/browser/default_app/default_app.js similarity index 100% rename from browser/default_app/default_app.js rename to atom/browser/default_app/default_app.js diff --git a/browser/default_app/index.html b/atom/browser/default_app/index.html similarity index 100% rename from browser/default_app/index.html rename to atom/browser/default_app/index.html diff --git a/browser/default_app/main.js b/atom/browser/default_app/main.js similarity index 100% rename from browser/default_app/main.js rename to atom/browser/default_app/main.js diff --git a/browser/default_app/package.json b/atom/browser/default_app/package.json similarity index 100% rename from browser/default_app/package.json rename to atom/browser/default_app/package.json diff --git a/browser/devtools_delegate.cc b/atom/browser/devtools_delegate.cc similarity index 97% rename from browser/devtools_delegate.cc rename to atom/browser/devtools_delegate.cc index 3886bfe22..b66abdd63 100644 --- a/browser/devtools_delegate.cc +++ b/atom/browser/devtools_delegate.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/devtools_delegate.h" +#include "atom/browser/devtools_delegate.h" #include "base/message_loop/message_loop.h" #include "base/values.h" -#include "browser/native_window.h" +#include "atom/browser/native_window.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_client_host.h" #include "content/public/browser/devtools_http_handler.h" diff --git a/browser/devtools_delegate.h b/atom/browser/devtools_delegate.h similarity index 98% rename from browser/devtools_delegate.h rename to atom/browser/devtools_delegate.h index 54e05a25b..f6a7b8492 100644 --- a/browser/devtools_delegate.h +++ b/atom/browser/devtools_delegate.h @@ -6,7 +6,7 @@ #define ATOM_BROWSER_DEVTOOLS_DELEGATE_H_ #include "base/memory/scoped_ptr.h" -#include "browser/native_window_observer.h" +#include "atom/browser/native_window_observer.h" #include "content/public/browser/devtools_frontend_host_delegate.h" #include "content/public/browser/web_contents_observer.h" #include "vendor/brightray/browser/devtools_embedder_message_dispatcher.h" diff --git a/browser/lib/init.coffee b/atom/browser/lib/init.coffee similarity index 100% rename from browser/lib/init.coffee rename to atom/browser/lib/init.coffee diff --git a/browser/lib/objects-registry.coffee b/atom/browser/lib/objects-registry.coffee similarity index 100% rename from browser/lib/objects-registry.coffee rename to atom/browser/lib/objects-registry.coffee diff --git a/browser/lib/rpc-server.coffee b/atom/browser/lib/rpc-server.coffee similarity index 100% rename from browser/lib/rpc-server.coffee rename to atom/browser/lib/rpc-server.coffee diff --git a/browser/native_window.cc b/atom/browser/native_window.cc similarity index 97% rename from browser/native_window.cc rename to atom/browser/native_window.cc index bff1c2f3c..9cc38bf96 100644 --- a/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/native_window.h" +#include "atom/browser/native_window.h" #include @@ -13,13 +13,13 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "browser/api/atom_browser_bindings.h" -#include "browser/atom_browser_context.h" -#include "browser/atom_browser_main_parts.h" -#include "browser/atom_javascript_dialog_manager.h" -#include "browser/browser.h" -#include "browser/devtools_delegate.h" -#include "browser/window_list.h" +#include "atom/browser/api/atom_browser_bindings.h" +#include "atom/browser/atom_browser_context.h" +#include "atom/browser/atom_browser_main_parts.h" +#include "atom/browser/atom_javascript_dialog_manager.h" +#include "atom/browser/browser.h" +#include "atom/browser/devtools_delegate.h" +#include "atom/browser/window_list.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/navigation_entry.h" @@ -31,9 +31,9 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/renderer_preferences.h" -#include "common/api/api_messages.h" -#include "common/atom_version.h" -#include "common/options_switches.h" +#include "atom/common/api/api_messages.h" +#include "atom/common/atom_version.h" +#include "atom/common/options_switches.h" #include "ipc/ipc_message_macros.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/point.h" diff --git a/browser/native_window.h b/atom/browser/native_window.h similarity index 99% rename from browser/native_window.h rename to atom/browser/native_window.h index 287138aa8..871719203 100644 --- a/browser/native_window.h +++ b/atom/browser/native_window.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "browser/native_window_observer.h" +#include "atom/browser/native_window_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_observer.h" #include "ui/gfx/image/image.h" diff --git a/browser/native_window_gtk.cc b/atom/browser/native_window_gtk.cc similarity index 98% rename from browser/native_window_gtk.cc rename to atom/browser/native_window_gtk.cc index e90a1954a..34bdcb25b 100644 --- a/browser/native_window_gtk.cc +++ b/atom/browser/native_window_gtk.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/native_window_gtk.h" +#include "atom/browser/native_window_gtk.h" #include "base/values.h" -#include "browser/ui/gtk/gtk_window_util.h" -#include "common/draggable_region.h" -#include "common/options_switches.h" +#include "atom/browser/ui/gtk/gtk_window_util.h" +#include "atom/common/draggable_region.h" +#include "atom/common/options_switches.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/renderer_preferences.h" diff --git a/browser/native_window_gtk.h b/atom/browser/native_window_gtk.h similarity index 97% rename from browser/native_window_gtk.h rename to atom/browser/native_window_gtk.h index d72b4a05f..76da28567 100644 --- a/browser/native_window_gtk.h +++ b/atom/browser/native_window_gtk.h @@ -7,9 +7,9 @@ #include -#include "browser/native_window.h" -#include "browser/ui/accelerator_util.h" -#include "browser/ui/gtk/menu_gtk.h" +#include "atom/browser/native_window.h" +#include "atom/browser/ui/accelerator_util.h" +#include "atom/browser/ui/gtk/menu_gtk.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/browser/native_window_mac.h b/atom/browser/native_window_mac.h similarity index 98% rename from browser/native_window_mac.h rename to atom/browser/native_window_mac.h index 0338eebef..d5efdfefe 100644 --- a/browser/native_window_mac.h +++ b/atom/browser/native_window_mac.h @@ -8,7 +8,7 @@ #import #include "base/memory/scoped_ptr.h" -#include "browser/native_window.h" +#include "atom/browser/native_window.h" class SkRegion; diff --git a/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm similarity index 98% rename from browser/native_window_mac.mm rename to atom/browser/native_window_mac.mm index 9ef68f42c..8ee127692 100644 --- a/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/native_window_mac.h" +#include "atom/browser/native_window_mac.h" #include @@ -10,11 +10,11 @@ #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "base/values.h" -#import "browser/ui/cocoa/event_processing_window.h" +#import "atom/browser/ui/cocoa/event_processing_window.h" #include "brightray/browser/inspectable_web_contents.h" #include "brightray/browser/inspectable_web_contents_view.h" -#include "common/draggable_region.h" -#include "common/options_switches.h" +#include "atom/common/draggable_region.h" +#include "atom/common/options_switches.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/browser/native_window_observer.h b/atom/browser/native_window_observer.h similarity index 100% rename from browser/native_window_observer.h rename to atom/browser/native_window_observer.h diff --git a/browser/native_window_win.cc b/atom/browser/native_window_win.cc similarity index 98% rename from browser/native_window_win.cc rename to atom/browser/native_window_win.cc index af8b34184..245e1af3e 100644 --- a/browser/native_window_win.cc +++ b/atom/browser/native_window_win.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/native_window_win.h" +#include "atom/browser/native_window_win.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "browser/api/atom_api_menu.h" -#include "browser/ui/win/menu_2.h" -#include "browser/ui/win/native_menu_win.h" -#include "common/draggable_region.h" -#include "common/options_switches.h" +#include "atom/browser/api/atom_api_menu.h" +#include "atom/browser/ui/win/menu_2.h" +#include "atom/browser/ui/win/native_menu_win.h" +#include "atom/common/draggable_region.h" +#include "atom/common/options_switches.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" diff --git a/browser/native_window_win.h b/atom/browser/native_window_win.h similarity index 98% rename from browser/native_window_win.h rename to atom/browser/native_window_win.h index cab0abe84..769ef5d97 100644 --- a/browser/native_window_win.h +++ b/atom/browser/native_window_win.h @@ -7,8 +7,8 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" -#include "browser/native_window.h" -#include "browser/ui/accelerator_util.h" +#include "atom/browser/native_window.h" +#include "atom/browser/ui/accelerator_util.h" #include "ui/gfx/size.h" #include "ui/views/widget/widget_delegate.h" diff --git a/browser/net/adapter_request_job.cc b/atom/browser/net/adapter_request_job.cc similarity index 97% rename from browser/net/adapter_request_job.cc rename to atom/browser/net/adapter_request_job.cc index 70c929327..cfa54aa11 100644 --- a/browser/net/adapter_request_job.cc +++ b/atom/browser/net/adapter_request_job.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/net/adapter_request_job.h" +#include "atom/browser/net/adapter_request_job.h" #include "base/threading/sequenced_worker_pool.h" -#include "browser/net/url_request_string_job.h" +#include "atom/browser/net/url_request_string_job.h" #include "content/public/browser/browser_thread.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_error_job.h" diff --git a/browser/net/adapter_request_job.h b/atom/browser/net/adapter_request_job.h similarity index 100% rename from browser/net/adapter_request_job.h rename to atom/browser/net/adapter_request_job.h diff --git a/browser/net/atom_url_request_context_getter.cc b/atom/browser/net/atom_url_request_context_getter.cc similarity index 98% rename from browser/net/atom_url_request_context_getter.cc rename to atom/browser/net/atom_url_request_context_getter.cc index bdc72028e..811bd584d 100644 --- a/browser/net/atom_url_request_context_getter.cc +++ b/atom/browser/net/atom_url_request_context_getter.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/net/atom_url_request_context_getter.h" +#include "atom/browser/net/atom_url_request_context_getter.h" #include "base/strings/string_util.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/worker_pool.h" -#include "browser/net/atom_url_request_job_factory.h" +#include "atom/browser/net/atom_url_request_job_factory.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/cookie_store_factory.h" #include "content/public/common/url_constants.h" diff --git a/browser/net/atom_url_request_context_getter.h b/atom/browser/net/atom_url_request_context_getter.h similarity index 100% rename from browser/net/atom_url_request_context_getter.h rename to atom/browser/net/atom_url_request_context_getter.h diff --git a/browser/net/atom_url_request_job_factory.cc b/atom/browser/net/atom_url_request_job_factory.cc similarity index 98% rename from browser/net/atom_url_request_job_factory.cc rename to atom/browser/net/atom_url_request_job_factory.cc index 01188674d..b0ee61049 100644 --- a/browser/net/atom_url_request_job_factory.cc +++ b/atom/browser/net/atom_url_request_job_factory.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/net/atom_url_request_job_factory.h" +#include "atom/browser/net/atom_url_request_job_factory.h" #include "base/stl_util.h" #include "net/base/load_flags.h" diff --git a/browser/net/atom_url_request_job_factory.h b/atom/browser/net/atom_url_request_job_factory.h similarity index 100% rename from browser/net/atom_url_request_job_factory.h rename to atom/browser/net/atom_url_request_job_factory.h diff --git a/browser/net/url_request_string_job.cc b/atom/browser/net/url_request_string_job.cc similarity index 94% rename from browser/net/url_request_string_job.cc rename to atom/browser/net/url_request_string_job.cc index 4a0e3ada8..76ecb7de2 100644 --- a/browser/net/url_request_string_job.cc +++ b/atom/browser/net/url_request_string_job.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/net/url_request_string_job.h" +#include "atom/browser/net/url_request_string_job.h" #include "net/base/net_errors.h" diff --git a/browser/net/url_request_string_job.h b/atom/browser/net/url_request_string_job.h similarity index 100% rename from browser/net/url_request_string_job.h rename to atom/browser/net/url_request_string_job.h diff --git a/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist similarity index 100% rename from browser/resources/mac/Info.plist rename to atom/browser/resources/mac/Info.plist diff --git a/browser/resources/mac/atom.icns b/atom/browser/resources/mac/atom.icns similarity index 100% rename from browser/resources/mac/atom.icns rename to atom/browser/resources/mac/atom.icns diff --git a/browser/resources/win/atom.ico b/atom/browser/resources/win/atom.ico similarity index 100% rename from browser/resources/win/atom.ico rename to atom/browser/resources/win/atom.ico diff --git a/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc similarity index 100% rename from browser/resources/win/atom.rc rename to atom/browser/resources/win/atom.rc diff --git a/browser/resources/win/resource.h b/atom/browser/resources/win/resource.h similarity index 100% rename from browser/resources/win/resource.h rename to atom/browser/resources/win/resource.h diff --git a/browser/ui/accelerator_util.cc b/atom/browser/ui/accelerator_util.cc similarity index 99% rename from browser/ui/accelerator_util.cc rename to atom/browser/ui/accelerator_util.cc index b85bd6685..424d48109 100644 --- a/browser/ui/accelerator_util.cc +++ b/atom/browser/ui/accelerator_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/accelerator_util.h" +#include "atom/browser/ui/accelerator_util.h" #include diff --git a/browser/ui/accelerator_util.h b/atom/browser/ui/accelerator_util.h similarity index 100% rename from browser/ui/accelerator_util.h rename to atom/browser/ui/accelerator_util.h diff --git a/browser/ui/accelerator_util_gtk.cc b/atom/browser/ui/accelerator_util_gtk.cc similarity index 93% rename from browser/ui/accelerator_util_gtk.cc rename to atom/browser/ui/accelerator_util_gtk.cc index ac14b260b..875266789 100644 --- a/browser/ui/accelerator_util_gtk.cc +++ b/atom/browser/ui/accelerator_util_gtk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/accelerator_util.h" +#include "atom/browser/ui/accelerator_util.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/platform_accelerator_gtk.h" diff --git a/browser/ui/accelerator_util_mac.mm b/atom/browser/ui/accelerator_util_mac.mm similarity index 96% rename from browser/ui/accelerator_util_mac.mm rename to atom/browser/ui/accelerator_util_mac.mm index 5f5bb700a..536b04b45 100644 --- a/browser/ui/accelerator_util_mac.mm +++ b/atom/browser/ui/accelerator_util_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/accelerator_util.h" +#include "atom/browser/ui/accelerator_util.h" #include "ui/base/accelerators/accelerator.h" #import "ui/base/accelerators/platform_accelerator_cocoa.h" diff --git a/browser/ui/accelerator_util_win.cc b/atom/browser/ui/accelerator_util_win.cc similarity index 87% rename from browser/ui/accelerator_util_win.cc rename to atom/browser/ui/accelerator_util_win.cc index d4a861fd1..c84166246 100644 --- a/browser/ui/accelerator_util_win.cc +++ b/atom/browser/ui/accelerator_util_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/accelerator_util.h" +#include "atom/browser/ui/accelerator_util.h" #include "ui/base/accelerators/accelerator.h" diff --git a/browser/ui/cocoa/atom_menu_controller.h b/atom/browser/ui/cocoa/atom_menu_controller.h similarity index 100% rename from browser/ui/cocoa/atom_menu_controller.h rename to atom/browser/ui/cocoa/atom_menu_controller.h diff --git a/browser/ui/cocoa/atom_menu_controller.mm b/atom/browser/ui/cocoa/atom_menu_controller.mm similarity index 99% rename from browser/ui/cocoa/atom_menu_controller.mm rename to atom/browser/ui/cocoa/atom_menu_controller.mm index 0a23ab292..0312ef169 100644 --- a/browser/ui/cocoa/atom_menu_controller.mm +++ b/atom/browser/ui/cocoa/atom_menu_controller.mm @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "browser/ui/cocoa/atom_menu_controller.h" +#import "atom/browser/ui/cocoa/atom_menu_controller.h" #include "base/logging.h" #include "base/strings/sys_string_conversions.h" diff --git a/browser/ui/cocoa/event_processing_window.h b/atom/browser/ui/cocoa/event_processing_window.h similarity index 100% rename from browser/ui/cocoa/event_processing_window.h rename to atom/browser/ui/cocoa/event_processing_window.h diff --git a/browser/ui/cocoa/event_processing_window.mm b/atom/browser/ui/cocoa/event_processing_window.mm similarity index 98% rename from browser/ui/cocoa/event_processing_window.mm rename to atom/browser/ui/cocoa/event_processing_window.mm index ce6e9b2f3..2efba68d2 100644 --- a/browser/ui/cocoa/event_processing_window.mm +++ b/atom/browser/ui/cocoa/event_processing_window.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "browser/ui/cocoa/event_processing_window.h" +#import "atom/browser/ui/cocoa/event_processing_window.h" #include "base/logging.h" #import "content/public/browser/render_widget_host_view_mac_base.h" diff --git a/browser/ui/file_dialog.h b/atom/browser/ui/file_dialog.h similarity index 100% rename from browser/ui/file_dialog.h rename to atom/browser/ui/file_dialog.h diff --git a/browser/ui/file_dialog_gtk.cc b/atom/browser/ui/file_dialog_gtk.cc similarity index 98% rename from browser/ui/file_dialog_gtk.cc rename to atom/browser/ui/file_dialog_gtk.cc index 94c9d53c0..b3ac3b975 100644 --- a/browser/ui/file_dialog_gtk.cc +++ b/atom/browser/ui/file_dialog_gtk.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/file_dialog.h" +#include "atom/browser/ui/file_dialog.h" #include "base/callback.h" #include "base/file_util.h" -#include "browser/native_window.h" -#include "browser/ui/gtk/gtk_util.h" +#include "atom/browser/native_window.h" +#include "atom/browser/ui/gtk/gtk_util.h" #include "ui/base/gtk/gtk_signal.h" namespace file_dialog { diff --git a/browser/ui/file_dialog_mac.mm b/atom/browser/ui/file_dialog_mac.mm similarity index 98% rename from browser/ui/file_dialog_mac.mm rename to atom/browser/ui/file_dialog_mac.mm index 80f655d9f..495db6849 100644 --- a/browser/ui/file_dialog_mac.mm +++ b/atom/browser/ui/file_dialog_mac.mm @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/file_dialog.h" +#include "atom/browser/ui/file_dialog.h" #import #include #include "base/file_util.h" #include "base/strings/sys_string_conversions.h" -#include "browser/native_window.h" +#include "atom/browser/native_window.h" namespace file_dialog { diff --git a/browser/ui/file_dialog_win.cc b/atom/browser/ui/file_dialog_win.cc similarity index 99% rename from browser/ui/file_dialog_win.cc rename to atom/browser/ui/file_dialog_win.cc index b8b8233db..d813dfe9a 100644 --- a/browser/ui/file_dialog_win.cc +++ b/atom/browser/ui/file_dialog_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/file_dialog.h" +#include "atom/browser/ui/file_dialog.h" #include #include @@ -15,7 +15,7 @@ #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" -#include "browser/native_window.h" +#include "atom/browser/native_window.h" #include "third_party/wtl/include/atlapp.h" #include "third_party/wtl/include/atldlgs.h" diff --git a/browser/ui/gtk/event_utils.cc b/atom/browser/ui/gtk/event_utils.cc similarity index 97% rename from browser/ui/gtk/event_utils.cc rename to atom/browser/ui/gtk/event_utils.cc index c21e15417..76c998a68 100644 --- a/browser/ui/gtk/event_utils.cc +++ b/atom/browser/ui/gtk/event_utils.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/gtk/event_utils.h" +#include "atom/browser/ui/gtk/event_utils.h" #include "base/logging.h" #include "ui/base/window_open_disposition.h" diff --git a/browser/ui/gtk/event_utils.h b/atom/browser/ui/gtk/event_utils.h similarity index 100% rename from browser/ui/gtk/event_utils.h rename to atom/browser/ui/gtk/event_utils.h diff --git a/browser/ui/gtk/gtk_custom_menu.cc b/atom/browser/ui/gtk/gtk_custom_menu.cc similarity index 98% rename from browser/ui/gtk/gtk_custom_menu.cc rename to atom/browser/ui/gtk/gtk_custom_menu.cc index 4606cafdc..6dc4c4ed9 100644 --- a/browser/ui/gtk/gtk_custom_menu.cc +++ b/atom/browser/ui/gtk/gtk_custom_menu.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/gtk/gtk_custom_menu.h" +#include "atom/browser/ui/gtk/gtk_custom_menu.h" -#include "browser/ui/gtk/gtk_custom_menu_item.h" +#include "atom/browser/ui/gtk/gtk_custom_menu_item.h" G_DEFINE_TYPE(GtkCustomMenu, gtk_custom_menu, GTK_TYPE_MENU) diff --git a/browser/ui/gtk/gtk_custom_menu.h b/atom/browser/ui/gtk/gtk_custom_menu.h similarity index 100% rename from browser/ui/gtk/gtk_custom_menu.h rename to atom/browser/ui/gtk/gtk_custom_menu.h diff --git a/browser/ui/gtk/gtk_custom_menu_item.cc b/atom/browser/ui/gtk/gtk_custom_menu_item.cc similarity index 99% rename from browser/ui/gtk/gtk_custom_menu_item.cc rename to atom/browser/ui/gtk/gtk_custom_menu_item.cc index 617c17119..b9c81581a 100644 --- a/browser/ui/gtk/gtk_custom_menu_item.cc +++ b/atom/browser/ui/gtk/gtk_custom_menu_item.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/gtk/gtk_custom_menu_item.h" +#include "atom/browser/ui/gtk/gtk_custom_menu_item.h" #include "base/i18n/rtl.h" -#include "browser/ui/gtk/gtk_custom_menu.h" +#include "atom/browser/ui/gtk/gtk_custom_menu.h" #include "ui/gfx/gtk_compat.h" // This method was autogenerated by the program glib-genmarshall, which diff --git a/browser/ui/gtk/gtk_custom_menu_item.h b/atom/browser/ui/gtk/gtk_custom_menu_item.h similarity index 100% rename from browser/ui/gtk/gtk_custom_menu_item.h rename to atom/browser/ui/gtk/gtk_custom_menu_item.h diff --git a/browser/ui/gtk/gtk_util.cc b/atom/browser/ui/gtk/gtk_util.cc similarity index 98% rename from browser/ui/gtk/gtk_util.cc rename to atom/browser/ui/gtk/gtk_util.cc index 8f6f7c8da..7db95dadf 100644 --- a/browser/ui/gtk/gtk_util.cc +++ b/atom/browser/ui/gtk/gtk_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/gtk/gtk_util.h" +#include "atom/browser/ui/gtk/gtk_util.h" #include diff --git a/browser/ui/gtk/gtk_util.h b/atom/browser/ui/gtk/gtk_util.h similarity index 100% rename from browser/ui/gtk/gtk_util.h rename to atom/browser/ui/gtk/gtk_util.h diff --git a/browser/ui/gtk/gtk_window_util.cc b/atom/browser/ui/gtk/gtk_window_util.cc similarity index 99% rename from browser/ui/gtk/gtk_window_util.cc rename to atom/browser/ui/gtk/gtk_window_util.cc index c06e3302b..e68102c9d 100644 --- a/browser/ui/gtk/gtk_window_util.cc +++ b/atom/browser/ui/gtk/gtk_window_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/gtk/gtk_window_util.h" +#include "atom/browser/ui/gtk/gtk_window_util.h" #include #include "content/public/browser/render_view_host.h" diff --git a/browser/ui/gtk/gtk_window_util.h b/atom/browser/ui/gtk/gtk_window_util.h similarity index 100% rename from browser/ui/gtk/gtk_window_util.h rename to atom/browser/ui/gtk/gtk_window_util.h diff --git a/browser/ui/gtk/menu_gtk.cc b/atom/browser/ui/gtk/menu_gtk.cc similarity index 99% rename from browser/ui/gtk/menu_gtk.cc rename to atom/browser/ui/gtk/menu_gtk.cc index 50f19fb96..c3d32dbcc 100644 --- a/browser/ui/gtk/menu_gtk.cc +++ b/atom/browser/ui/gtk/menu_gtk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/gtk/menu_gtk.h" +#include "atom/browser/ui/gtk/menu_gtk.h" #include @@ -12,10 +12,10 @@ #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "browser/ui/gtk/event_utils.h" -#include "browser/ui/gtk/gtk_custom_menu.h" -#include "browser/ui/gtk/gtk_custom_menu_item.h" -#include "browser/ui/gtk/gtk_util.h" +#include "atom/browser/ui/gtk/event_utils.h" +#include "atom/browser/ui/gtk/gtk_custom_menu.h" +#include "atom/browser/ui/gtk/gtk_custom_menu_item.h" +#include "atom/browser/ui/gtk/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/accelerators/menu_label_accelerator_util_linux.h" #include "ui/base/accelerators/platform_accelerator_gtk.h" diff --git a/browser/ui/gtk/menu_gtk.h b/atom/browser/ui/gtk/menu_gtk.h similarity index 100% rename from browser/ui/gtk/menu_gtk.h rename to atom/browser/ui/gtk/menu_gtk.h diff --git a/browser/ui/message_box.h b/atom/browser/ui/message_box.h similarity index 100% rename from browser/ui/message_box.h rename to atom/browser/ui/message_box.h diff --git a/browser/ui/message_box_gtk.cc b/atom/browser/ui/message_box_gtk.cc similarity index 97% rename from browser/ui/message_box_gtk.cc rename to atom/browser/ui/message_box_gtk.cc index 0fbb156f7..73447340b 100644 --- a/browser/ui/message_box_gtk.cc +++ b/atom/browser/ui/message_box_gtk.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/message_box.h" +#include "atom/browser/ui/message_box.h" #include "base/callback.h" #include "base/strings/string_util.h" -#include "browser/native_window.h" -#include "browser/ui/gtk/gtk_util.h" +#include "atom/browser/native_window.h" +#include "atom/browser/ui/gtk/gtk_util.h" #include "ui/base/gtk/gtk_signal.h" namespace atom { diff --git a/browser/ui/message_box_mac.mm b/atom/browser/ui/message_box_mac.mm similarity index 98% rename from browser/ui/message_box_mac.mm rename to atom/browser/ui/message_box_mac.mm index 5847d2619..8e9acf960 100644 --- a/browser/ui/message_box_mac.mm +++ b/atom/browser/ui/message_box_mac.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/message_box.h" +#include "atom/browser/ui/message_box.h" #import #include "base/callback.h" #include "base/strings/sys_string_conversions.h" -#include "browser/native_window.h" +#include "atom/browser/native_window.h" @interface ModalDelegate : NSObject { @private diff --git a/browser/ui/message_box_win.cc b/atom/browser/ui/message_box_win.cc similarity index 99% rename from browser/ui/message_box_win.cc rename to atom/browser/ui/message_box_win.cc index c7a61b8ed..3227c8b2a 100644 --- a/browser/ui/message_box_win.cc +++ b/atom/browser/ui/message_box_win.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/message_box.h" +#include "atom/browser/ui/message_box.h" #include "base/callback.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "browser/native_window.h" +#include "atom/browser/native_window.h" #include "skia/ext/skia_utils_win.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/message_box_view.h" diff --git a/browser/ui/win/menu_2.cc b/atom/browser/ui/win/menu_2.cc similarity index 97% rename from browser/ui/win/menu_2.cc rename to atom/browser/ui/win/menu_2.cc index c2bcd476e..6db97359b 100644 --- a/browser/ui/win/menu_2.cc +++ b/atom/browser/ui/win/menu_2.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/win/menu_2.h" +#include "atom/browser/ui/win/menu_2.h" #include "ui/base/models/menu_model.h" #include "ui/views/controls/menu/menu_listener.h" diff --git a/browser/ui/win/menu_2.h b/atom/browser/ui/win/menu_2.h similarity index 98% rename from browser/ui/win/menu_2.h rename to atom/browser/ui/win/menu_2.h index 67a80e28d..396d33022 100644 --- a/browser/ui/win/menu_2.h +++ b/atom/browser/ui/win/menu_2.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "browser/ui/win/native_menu_win.h" +#include "atom/browser/ui/win/native_menu_win.h" #include "ui/gfx/native_widget_types.h" namespace gfx { diff --git a/browser/ui/win/native_menu_win.cc b/atom/browser/ui/win/native_menu_win.cc similarity index 99% rename from browser/ui/win/native_menu_win.cc rename to atom/browser/ui/win/native_menu_win.cc index 9ed6b8306..47555f8f3 100644 --- a/browser/ui/win/native_menu_win.cc +++ b/atom/browser/ui/win/native_menu_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/ui/win/native_menu_win.h" +#include "atom/browser/ui/win/native_menu_win.h" #include @@ -12,7 +12,7 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/win/wrapped_window_proc.h" -#include "browser/ui/win/menu_2.h" +#include "atom/browser/ui/win/menu_2.h" #include "ui/base/accelerators/accelerator.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" diff --git a/browser/ui/win/native_menu_win.h b/atom/browser/ui/win/native_menu_win.h similarity index 100% rename from browser/ui/win/native_menu_win.h rename to atom/browser/ui/win/native_menu_win.h diff --git a/browser/window_list.cc b/atom/browser/window_list.cc similarity index 94% rename from browser/window_list.cc rename to atom/browser/window_list.cc index 891ac5b03..9343d89ac 100644 --- a/browser/window_list.cc +++ b/atom/browser/window_list.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/window_list.h" +#include "atom/browser/window_list.h" #include #include "base/logging.h" -#include "browser/native_window.h" -#include "browser/window_list_observer.h" +#include "atom/browser/native_window.h" +#include "atom/browser/window_list_observer.h" namespace atom { diff --git a/browser/window_list.h b/atom/browser/window_list.h similarity index 100% rename from browser/window_list.h rename to atom/browser/window_list.h diff --git a/browser/window_list_observer.h b/atom/browser/window_list_observer.h similarity index 100% rename from browser/window_list_observer.h rename to atom/browser/window_list_observer.h diff --git a/common/api/api_messages.cc b/atom/common/api/api_messages.cc similarity index 73% rename from common/api/api_messages.cc rename to atom/common/api/api_messages.cc index e5ba3c9f1..4fa907517 100644 --- a/common/api/api_messages.cc +++ b/atom/common/api/api_messages.cc @@ -4,30 +4,30 @@ // Get basic type definitions. #define IPC_MESSAGE_IMPL -#include "common/api/api_messages.h" +#include "atom/common/api/api_messages.h" // Generate constructors. #include "ipc/struct_constructor_macros.h" -#include "common/api/api_messages.h" +#include "atom/common/api/api_messages.h" // Generate destructors. #include "ipc/struct_destructor_macros.h" -#include "common/api/api_messages.h" +#include "atom/common/api/api_messages.h" // Generate param traits write methods. #include "ipc/param_traits_write_macros.h" namespace IPC { -#include "common/api/api_messages.h" +#include "atom/common/api/api_messages.h" } // namespace IPC // Generate param traits read methods. #include "ipc/param_traits_read_macros.h" namespace IPC { -#include "common/api/api_messages.h" +#include "atom/common/api/api_messages.h" } // namespace IPC // Generate param traits log methods. #include "ipc/param_traits_log_macros.h" namespace IPC { -#include "common/api/api_messages.h" +#include "atom/common/api/api_messages.h" } // namespace IPC diff --git a/common/api/api_messages.h b/atom/common/api/api_messages.h similarity index 97% rename from common/api/api_messages.h rename to atom/common/api/api_messages.h index e92a4d3f0..003ac790f 100644 --- a/common/api/api_messages.h +++ b/atom/common/api/api_messages.h @@ -6,7 +6,7 @@ #include "base/strings/string16.h" #include "base/values.h" -#include "common/draggable_region.h" +#include "atom/common/draggable_region.h" #include "content/public/common/common_param_traits.h" #include "ipc/ipc_message_macros.h" diff --git a/common/api/atom_api_clipboard.cc b/atom/common/api/atom_api_clipboard.cc similarity index 94% rename from common/api/atom_api_clipboard.cc rename to atom/common/api/atom_api_clipboard.cc index d0c97d350..e7d4c7e96 100644 --- a/common/api/atom_api_clipboard.cc +++ b/atom/common/api/atom_api_clipboard.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/api/atom_api_clipboard.h" +#include "atom/common/api/atom_api_clipboard.h" #include -#include "common/v8/native_type_conversions.h" +#include "atom/common/v8/native_type_conversions.h" #include "ui/base/clipboard/clipboard.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/common/api/atom_api_clipboard.h b/atom/common/api/atom_api_clipboard.h similarity index 100% rename from common/api/atom_api_clipboard.h rename to atom/common/api/atom_api_clipboard.h diff --git a/common/api/atom_api_crash_reporter.cc b/atom/common/api/atom_api_crash_reporter.cc similarity index 82% rename from common/api/atom_api_crash_reporter.cc rename to atom/common/api/atom_api_crash_reporter.cc index d64796e2c..325cb69c7 100644 --- a/common/api/atom_api_crash_reporter.cc +++ b/atom/common/api/atom_api_crash_reporter.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/api/atom_api_crash_reporter.h" +#include "atom/common/api/atom_api_crash_reporter.h" -#include "common/crash_reporter/crash_reporter.h" -#include "common/v8/native_type_conversions.h" +#include "atom/common/crash_reporter/crash_reporter.h" +#include "atom/common/v8/native_type_conversions.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/common/api/atom_api_crash_reporter.h b/atom/common/api/atom_api_crash_reporter.h similarity index 100% rename from common/api/atom_api_crash_reporter.h rename to atom/common/api/atom_api_crash_reporter.h diff --git a/common/api/atom_api_event_emitter.cc b/atom/common/api/atom_api_event_emitter.cc similarity index 91% rename from common/api/atom_api_event_emitter.cc rename to atom/common/api/atom_api_event_emitter.cc index 998876b05..c66404924 100644 --- a/common/api/atom_api_event_emitter.cc +++ b/atom/common/api/atom_api_event_emitter.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/api/atom_api_event_emitter.h" +#include "atom/common/api/atom_api_event_emitter.h" #include #include "base/logging.h" -#include "browser/api/atom_api_event.h" -#include "common/v8/native_type_conversions.h" +#include "atom/browser/api/atom_api_event.h" +#include "atom/common/v8/native_type_conversions.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/common/api/atom_api_event_emitter.h b/atom/common/api/atom_api_event_emitter.h similarity index 100% rename from common/api/atom_api_event_emitter.h rename to atom/common/api/atom_api_event_emitter.h diff --git a/common/api/atom_api_id_weak_map.cc b/atom/common/api/atom_api_id_weak_map.cc similarity index 96% rename from common/api/atom_api_id_weak_map.cc rename to atom/common/api/atom_api_id_weak_map.cc index 09abbe901..3a2fb2ce5 100644 --- a/common/api/atom_api_id_weak_map.cc +++ b/atom/common/api/atom_api_id_weak_map.cc @@ -3,13 +3,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/api/atom_api_id_weak_map.h" +#include "atom/common/api/atom_api_id_weak_map.h" #include #include "base/logging.h" -#include "common/v8/native_type_conversions.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/native_type_conversions.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/common/api/atom_api_id_weak_map.h b/atom/common/api/atom_api_id_weak_map.h similarity index 96% rename from common/api/atom_api_id_weak_map.h rename to atom/common/api/atom_api_id_weak_map.h index d2c0a33ac..c4e02c2c8 100644 --- a/common/api/atom_api_id_weak_map.h +++ b/atom/common/api/atom_api_id_weak_map.h @@ -9,7 +9,7 @@ #include #include "base/basictypes.h" -#include "common/v8/scoped_persistent.h" +#include "atom/common/v8/scoped_persistent.h" #include "vendor/node/src/node_object_wrap.h" namespace atom { diff --git a/common/api/atom_api_screen.cc b/atom/common/api/atom_api_screen.cc similarity index 94% rename from common/api/atom_api_screen.cc rename to atom/common/api/atom_api_screen.cc index 8e7945003..f5dc4388d 100644 --- a/common/api/atom_api_screen.cc +++ b/atom/common/api/atom_api_screen.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/api/atom_api_screen.h" +#include "atom/common/api/atom_api_screen.h" -#include "common/v8/native_type_conversions.h" +#include "atom/common/v8/native_type_conversions.h" #include "ui/gfx/screen.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" #if defined(TOOLKIT_GTK) #include "base/command_line.h" diff --git a/common/api/atom_api_screen.h b/atom/common/api/atom_api_screen.h similarity index 94% rename from common/api/atom_api_screen.h rename to atom/common/api/atom_api_screen.h index df762f3e8..65197d9c2 100644 --- a/common/api/atom_api_screen.h +++ b/atom/common/api/atom_api_screen.h @@ -5,7 +5,7 @@ #ifndef ATOM_COMMON_API_ATOM_API_SCREEN_H_ #define ATOM_COMMON_API_ATOM_API_SCREEN_H_ -#include "common/api/atom_api_event_emitter.h" +#include "atom/common/api/atom_api_event_emitter.h" namespace gfx { class Screen; diff --git a/common/api/atom_api_shell.cc b/atom/common/api/atom_api_shell.cc similarity index 91% rename from common/api/atom_api_shell.cc rename to atom/common/api/atom_api_shell.cc index 63a114b87..6864e25f2 100644 --- a/common/api/atom_api_shell.cc +++ b/atom/common/api/atom_api_shell.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/api/atom_api_shell.h" +#include "atom/common/api/atom_api_shell.h" #include #include "base/files/file_path.h" -#include "common/platform_util.h" -#include "common/v8/native_type_conversions.h" +#include "atom/common/platform_util.h" +#include "atom/common/v8/native_type_conversions.h" #include "url/gurl.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/common/api/atom_api_shell.h b/atom/common/api/atom_api_shell.h similarity index 100% rename from common/api/atom_api_shell.h rename to atom/common/api/atom_api_shell.h diff --git a/common/api/atom_api_v8_util.cc b/atom/common/api/atom_api_v8_util.cc similarity index 92% rename from common/api/atom_api_v8_util.cc rename to atom/common/api/atom_api_v8_util.cc index 1f3d250af..8aa206564 100644 --- a/common/api/atom_api_v8_util.cc +++ b/atom/common/api/atom_api_v8_util.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/api/object_life_monitor.h" +#include "atom/common/api/object_life_monitor.h" -#include "common/v8/native_type_conversions.h" +#include "atom/common/v8/native_type_conversions.h" #include "v8/include/v8-profiler.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc similarity index 97% rename from common/api/atom_bindings.cc rename to atom/common/api/atom_bindings.cc index 060486b45..91c5b2523 100644 --- a/common/api/atom_bindings.cc +++ b/atom/common/api/atom_bindings.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/api/atom_bindings.h" +#include "atom/common/api/atom_bindings.h" #include "base/logging.h" -#include "common/atom_version.h" -#include "common/v8/native_type_conversions.h" +#include "atom/common/atom_version.h" +#include "atom/common/v8/native_type_conversions.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/common/api/atom_bindings.h b/atom/common/api/atom_bindings.h similarity index 100% rename from common/api/atom_bindings.h rename to atom/common/api/atom_bindings.h diff --git a/common/api/atom_extensions.cc b/atom/common/api/atom_extensions.cc similarity index 91% rename from common/api/atom_extensions.cc rename to atom/common/api/atom_extensions.cc index 4bbf7dd63..16cd74e78 100644 --- a/common/api/atom_extensions.cc +++ b/atom/common/api/atom_extensions.cc @@ -8,7 +8,7 @@ #include "base/strings/string_util.h" #include "vendor/node/src/node_version.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { @@ -20,7 +20,7 @@ namespace atom { #define NODE_EXT_LIST_ITEM NODE_MODULE_DECL #define NODE_EXT_LIST_END -#include "common/api/atom_extensions.h" +#include "atom/common/api/atom_extensions.h" #undef NODE_EXT_LIST_START #undef NODE_EXT_LIST_ITEM @@ -31,7 +31,7 @@ namespace atom { #define NODE_EXT_LIST_ITEM NODE_EXT_STRING #define NODE_EXT_LIST_END NULL}; -#include "common/api/atom_extensions.h" // NOLINT +#include "atom/common/api/atom_extensions.h" // NOLINT node::node_module_struct* GetBuiltinModule(const char *name, bool is_browser) { char common[128]; diff --git a/common/api/atom_extensions.h b/atom/common/api/atom_extensions.h similarity index 100% rename from common/api/atom_extensions.h rename to atom/common/api/atom_extensions.h diff --git a/common/api/lib/callbacks-registry.coffee b/atom/common/api/lib/callbacks-registry.coffee similarity index 100% rename from common/api/lib/callbacks-registry.coffee rename to atom/common/api/lib/callbacks-registry.coffee diff --git a/common/api/lib/clipboard.coffee b/atom/common/api/lib/clipboard.coffee similarity index 100% rename from common/api/lib/clipboard.coffee rename to atom/common/api/lib/clipboard.coffee diff --git a/common/api/lib/crash-reporter.coffee b/atom/common/api/lib/crash-reporter.coffee similarity index 100% rename from common/api/lib/crash-reporter.coffee rename to atom/common/api/lib/crash-reporter.coffee diff --git a/common/api/lib/id-weak-map.coffee b/atom/common/api/lib/id-weak-map.coffee similarity index 100% rename from common/api/lib/id-weak-map.coffee rename to atom/common/api/lib/id-weak-map.coffee diff --git a/common/api/lib/screen.coffee b/atom/common/api/lib/screen.coffee similarity index 100% rename from common/api/lib/screen.coffee rename to atom/common/api/lib/screen.coffee diff --git a/common/api/lib/shell.coffee b/atom/common/api/lib/shell.coffee similarity index 100% rename from common/api/lib/shell.coffee rename to atom/common/api/lib/shell.coffee diff --git a/common/api/object_life_monitor.cc b/atom/common/api/object_life_monitor.cc similarity index 95% rename from common/api/object_life_monitor.cc rename to atom/common/api/object_life_monitor.cc index fc9514363..d058d6d5d 100644 --- a/common/api/object_life_monitor.cc +++ b/atom/common/api/object_life_monitor.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/api/object_life_monitor.h" +#include "atom/common/api/object_life_monitor.h" namespace atom { diff --git a/common/api/object_life_monitor.h b/atom/common/api/object_life_monitor.h similarity index 94% rename from common/api/object_life_monitor.h rename to atom/common/api/object_life_monitor.h index 2621a62ba..101560f16 100644 --- a/common/api/object_life_monitor.h +++ b/atom/common/api/object_life_monitor.h @@ -7,7 +7,7 @@ #define ATOM_COMMON_API_OBJECT_LIFE_MONITOR_H_ #include "base/basictypes.h" -#include "common/v8/scoped_persistent.h" +#include "atom/common/v8/scoped_persistent.h" namespace atom { diff --git a/common/atom_version.h b/atom/common/atom_version.h similarity index 100% rename from common/atom_version.h rename to atom/common/atom_version.h diff --git a/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc similarity index 91% rename from common/crash_reporter/crash_reporter.cc rename to atom/common/crash_reporter/crash_reporter.cc index 39d66956b..02d82a4cc 100644 --- a/common/crash_reporter/crash_reporter.cc +++ b/atom/common/crash_reporter/crash_reporter.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/crash_reporter/crash_reporter.h" +#include "atom/common/crash_reporter/crash_reporter.h" #include "base/command_line.h" -#include "browser/browser.h" -#include "common/atom_version.h" +#include "atom/browser/browser.h" +#include "atom/common/atom_version.h" #include "content/public/common/content_switches.h" namespace crash_reporter { diff --git a/common/crash_reporter/crash_reporter.h b/atom/common/crash_reporter/crash_reporter.h similarity index 100% rename from common/crash_reporter/crash_reporter.h rename to atom/common/crash_reporter/crash_reporter.h diff --git a/common/crash_reporter/crash_reporter_linux.cc b/atom/common/crash_reporter/crash_reporter_linux.cc similarity index 98% rename from common/crash_reporter/crash_reporter_linux.cc rename to atom/common/crash_reporter/crash_reporter_linux.cc index ded879a42..173bd6618 100644 --- a/common/crash_reporter/crash_reporter_linux.cc +++ b/atom/common/crash_reporter/crash_reporter_linux.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/crash_reporter/crash_reporter_linux.h" +#include "atom/common/crash_reporter/crash_reporter_linux.h" #include #include diff --git a/common/crash_reporter/crash_reporter_linux.h b/atom/common/crash_reporter/crash_reporter_linux.h similarity index 93% rename from common/crash_reporter/crash_reporter_linux.h rename to atom/common/crash_reporter/crash_reporter_linux.h index e2349bbe5..749d4a30b 100644 --- a/common/crash_reporter/crash_reporter_linux.h +++ b/atom/common/crash_reporter/crash_reporter_linux.h @@ -7,8 +7,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "common/crash_reporter/crash_reporter.h" -#include "common/crash_reporter/linux/crash_dump_handler.h" +#include "atom/common/crash_reporter/crash_reporter.h" +#include "atom/common/crash_reporter/linux/crash_dump_handler.h" template struct DefaultSingletonTraits; diff --git a/common/crash_reporter/crash_reporter_mac.h b/atom/common/crash_reporter/crash_reporter_mac.h similarity index 95% rename from common/crash_reporter/crash_reporter_mac.h rename to atom/common/crash_reporter/crash_reporter_mac.h index 800de9c86..b9a1cc129 100644 --- a/common/crash_reporter/crash_reporter_mac.h +++ b/atom/common/crash_reporter/crash_reporter_mac.h @@ -6,7 +6,7 @@ #define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_ #include "base/compiler_specific.h" -#include "common/crash_reporter/crash_reporter.h" +#include "atom/common/crash_reporter/crash_reporter.h" #import "vendor/breakpad/src/client/mac/Framework/Breakpad.h" template struct DefaultSingletonTraits; diff --git a/common/crash_reporter/crash_reporter_mac.mm b/atom/common/crash_reporter/crash_reporter_mac.mm similarity index 97% rename from common/crash_reporter/crash_reporter_mac.mm rename to atom/common/crash_reporter/crash_reporter_mac.mm index e43b7bb9d..dd2e849be 100644 --- a/common/crash_reporter/crash_reporter_mac.mm +++ b/atom/common/crash_reporter/crash_reporter_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/crash_reporter/crash_reporter_mac.h" +#include "atom/common/crash_reporter/crash_reporter_mac.h" #include "base/memory/singleton.h" #include "base/strings/sys_string_conversions.h" diff --git a/common/crash_reporter/crash_reporter_win.cc b/atom/common/crash_reporter/crash_reporter_win.cc similarity index 98% rename from common/crash_reporter/crash_reporter_win.cc rename to atom/common/crash_reporter/crash_reporter_win.cc index 2403b3b90..f8d1411c2 100644 --- a/common/crash_reporter/crash_reporter_win.cc +++ b/atom/common/crash_reporter/crash_reporter_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/crash_reporter/crash_reporter_win.h" +#include "atom/common/crash_reporter/crash_reporter_win.h" #include "base/file_util.h" #include "base/logging.h" diff --git a/common/crash_reporter/crash_reporter_win.h b/atom/common/crash_reporter/crash_reporter_win.h similarity index 97% rename from common/crash_reporter/crash_reporter_win.h rename to atom/common/crash_reporter/crash_reporter_win.h index 678697554..bf1ef752e 100644 --- a/common/crash_reporter/crash_reporter_win.h +++ b/atom/common/crash_reporter/crash_reporter_win.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "common/crash_reporter/crash_reporter.h" +#include "atom/common/crash_reporter/crash_reporter.h" #include "vendor/breakpad/src/client/windows/handler/exception_handler.h" template struct DefaultSingletonTraits; diff --git a/common/crash_reporter/linux/crash_dump_handler.cc b/atom/common/crash_reporter/linux/crash_dump_handler.cc similarity index 99% rename from common/crash_reporter/linux/crash_dump_handler.cc rename to atom/common/crash_reporter/linux/crash_dump_handler.cc index ddbd6e32d..824ada737 100644 --- a/common/crash_reporter/linux/crash_dump_handler.cc +++ b/atom/common/crash_reporter/linux/crash_dump_handler.cc @@ -6,7 +6,7 @@ // For linux_syscall_support.h. This makes it safe to call embedded system // calls when in seccomp mode. -#include "common/crash_reporter/linux/crash_dump_handler.h" +#include "atom/common/crash_reporter/linux/crash_dump_handler.h" #include diff --git a/common/crash_reporter/linux/crash_dump_handler.h b/atom/common/crash_reporter/linux/crash_dump_handler.h similarity index 100% rename from common/crash_reporter/linux/crash_dump_handler.h rename to atom/common/crash_reporter/linux/crash_dump_handler.h diff --git a/common/crash_reporter/win/crash_service.cc b/atom/common/crash_reporter/win/crash_service.cc similarity index 99% rename from common/crash_reporter/win/crash_service.cc rename to atom/common/crash_reporter/win/crash_service.cc index 0a16dc96a..e76c875b4 100644 --- a/common/crash_reporter/win/crash_service.cc +++ b/atom/common/crash_reporter/win/crash_service.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/crash_reporter/win/crash_service.h" +#include "atom/common/crash_reporter/win/crash_service.h" #include diff --git a/common/crash_reporter/win/crash_service.h b/atom/common/crash_reporter/win/crash_service.h similarity index 100% rename from common/crash_reporter/win/crash_service.h rename to atom/common/crash_reporter/win/crash_service.h diff --git a/common/crash_reporter/win/crash_service_main.cc b/atom/common/crash_reporter/win/crash_service_main.cc similarity index 96% rename from common/crash_reporter/win/crash_service_main.cc rename to atom/common/crash_reporter/win/crash_service_main.cc index b62fd538f..7cd35445d 100644 --- a/common/crash_reporter/win/crash_service_main.cc +++ b/atom/common/crash_reporter/win/crash_service_main.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/crash_reporter/win/crash_service_main.h" +#include "atom/common/crash_reporter/win/crash_service_main.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" #include "base/strings/string_util.h" -#include "common/crash_reporter/win/crash_service.h" +#include "atom/common/crash_reporter/win/crash_service.h" namespace crash_service { diff --git a/common/crash_reporter/win/crash_service_main.h b/atom/common/crash_reporter/win/crash_service_main.h similarity index 100% rename from common/crash_reporter/win/crash_service_main.h rename to atom/common/crash_reporter/win/crash_service_main.h diff --git a/common/draggable_region.cc b/atom/common/draggable_region.cc similarity index 86% rename from common/draggable_region.cc rename to atom/common/draggable_region.cc index e408c9b46..691279f0f 100644 --- a/common/draggable_region.cc +++ b/atom/common/draggable_region.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/draggable_region.h" +#include "atom/common/draggable_region.h" namespace atom { diff --git a/common/draggable_region.h b/atom/common/draggable_region.h similarity index 100% rename from common/draggable_region.h rename to atom/common/draggable_region.h diff --git a/common/lib/init.coffee b/atom/common/lib/init.coffee similarity index 100% rename from common/lib/init.coffee rename to atom/common/lib/init.coffee diff --git a/common/linux/application_info.cc b/atom/common/linux/application_info.cc similarity index 90% rename from common/linux/application_info.cc rename to atom/common/linux/application_info.cc index 93d33b567..a1ce5ada3 100644 --- a/common/linux/application_info.cc +++ b/atom/common/linux/application_info.cc @@ -4,7 +4,7 @@ #include -#include "common/atom_version.h" +#include "atom/common/atom_version.h" namespace brightray { diff --git a/common/node_bindings.cc b/atom/common/node_bindings.cc similarity index 98% rename from common/node_bindings.cc rename to atom/common/node_bindings.cc index 3d2d5ebcc..ef5e6ef73 100644 --- a/common/node_bindings.cc +++ b/atom/common/node_bindings.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/node_bindings.h" +#include "atom/common/node_bindings.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" #include "base/base_paths.h" #include "base/path_service.h" -#include "common/v8/native_type_conversions.h" +#include "atom/common/v8/native_type_conversions.h" #include "content/public/browser/browser_thread.h" #if defined(OS_WIN) #include "base/strings/utf_string_conversions.h" #endif -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" using content::BrowserThread; diff --git a/common/node_bindings.h b/atom/common/node_bindings.h similarity index 100% rename from common/node_bindings.h rename to atom/common/node_bindings.h diff --git a/common/node_bindings_linux.cc b/atom/common/node_bindings_linux.cc similarity index 97% rename from common/node_bindings_linux.cc rename to atom/common/node_bindings_linux.cc index 035441c8d..7aa5ccd10 100644 --- a/common/node_bindings_linux.cc +++ b/atom/common/node_bindings_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/node_bindings_linux.h" +#include "atom/common/node_bindings_linux.h" #include diff --git a/common/node_bindings_linux.h b/atom/common/node_bindings_linux.h similarity index 95% rename from common/node_bindings_linux.h rename to atom/common/node_bindings_linux.h index 83711543d..ba948a84b 100644 --- a/common/node_bindings_linux.h +++ b/atom/common/node_bindings_linux.h @@ -6,7 +6,7 @@ #define ATOM_COMMON_NODE_BINDINGS_LINUX_H_ #include "base/compiler_specific.h" -#include "common/node_bindings.h" +#include "atom/common/node_bindings.h" namespace atom { diff --git a/common/node_bindings_mac.cc b/atom/common/node_bindings_mac.cc similarity index 95% rename from common/node_bindings_mac.cc rename to atom/common/node_bindings_mac.cc index 0a31a1dd1..d918b8e76 100644 --- a/common/node_bindings_mac.cc +++ b/atom/common/node_bindings_mac.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/node_bindings_mac.h" +#include "atom/common/node_bindings_mac.h" #include #include #include #include -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/common/node_bindings_mac.h b/atom/common/node_bindings_mac.h similarity index 95% rename from common/node_bindings_mac.h rename to atom/common/node_bindings_mac.h index 4929c1a2c..1c1d5b57f 100644 --- a/common/node_bindings_mac.h +++ b/atom/common/node_bindings_mac.h @@ -6,7 +6,7 @@ #define ATOM_COMMON_NODE_BINDINGS_MAC_ #include "base/compiler_specific.h" -#include "common/node_bindings.h" +#include "atom/common/node_bindings.h" namespace atom { diff --git a/common/node_bindings_win.cc b/atom/common/node_bindings_win.cc similarity index 97% rename from common/node_bindings_win.cc rename to atom/common/node_bindings_win.cc index 15f5b32c2..6e56d80ba 100644 --- a/common/node_bindings_win.cc +++ b/atom/common/node_bindings_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/node_bindings_win.h" +#include "atom/common/node_bindings_win.h" #include diff --git a/common/node_bindings_win.h b/atom/common/node_bindings_win.h similarity index 93% rename from common/node_bindings_win.h rename to atom/common/node_bindings_win.h index 7a512313d..a8cdef880 100644 --- a/common/node_bindings_win.h +++ b/atom/common/node_bindings_win.h @@ -6,7 +6,7 @@ #define ATOM_COMMON_NODE_BINDINGS_WIN_ #include "base/compiler_specific.h" -#include "common/node_bindings.h" +#include "atom/common/node_bindings.h" namespace atom { diff --git a/common/options_switches.cc b/atom/common/options_switches.cc similarity index 96% rename from common/options_switches.cc rename to atom/common/options_switches.cc index 9e2934027..48358c579 100644 --- a/common/options_switches.cc +++ b/atom/common/options_switches.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/options_switches.h" +#include "atom/common/options_switches.h" namespace atom { diff --git a/common/options_switches.h b/atom/common/options_switches.h similarity index 100% rename from common/options_switches.h rename to atom/common/options_switches.h diff --git a/common/platform_util.h b/atom/common/platform_util.h similarity index 100% rename from common/platform_util.h rename to atom/common/platform_util.h diff --git a/common/platform_util_linux.cc b/atom/common/platform_util_linux.cc similarity index 98% rename from common/platform_util_linux.cc rename to atom/common/platform_util_linux.cc index d2ac2f88f..4d573a98b 100644 --- a/common/platform_util_linux.cc +++ b/atom/common/platform_util_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/platform_util.h" +#include "atom/common/platform_util.h" #include diff --git a/common/platform_util_mac.mm b/atom/common/platform_util_mac.mm similarity index 99% rename from common/platform_util_mac.mm rename to atom/common/platform_util_mac.mm index c01c43fdd..2a163c455 100644 --- a/common/platform_util_mac.mm +++ b/atom/common/platform_util_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/platform_util.h" +#include "atom/common/platform_util.h" #include #import diff --git a/common/platform_util_win.cc b/atom/common/platform_util_win.cc similarity index 99% rename from common/platform_util_win.cc rename to atom/common/platform_util_win.cc index 076167540..46ea850fc 100644 --- a/common/platform_util_win.cc +++ b/atom/common/platform_util_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/platform_util.h" +#include "atom/common/platform_util.h" #include #include diff --git a/common/resources/mac/Info.plist b/atom/common/resources/mac/Info.plist similarity index 100% rename from common/resources/mac/Info.plist rename to atom/common/resources/mac/Info.plist diff --git a/common/resources/mac/MainMenu.xib b/atom/common/resources/mac/MainMenu.xib similarity index 100% rename from common/resources/mac/MainMenu.xib rename to atom/common/resources/mac/MainMenu.xib diff --git a/common/swap_or_assign.h b/atom/common/swap_or_assign.h similarity index 100% rename from common/swap_or_assign.h rename to atom/common/swap_or_assign.h diff --git a/common/v8/native_type_conversions.h b/atom/common/v8/native_type_conversions.h similarity index 98% rename from common/v8/native_type_conversions.h rename to atom/common/v8/native_type_conversions.h index 2beed8bef..82861d48c 100644 --- a/common/v8/native_type_conversions.h +++ b/atom/common/v8/native_type_conversions.h @@ -13,10 +13,10 @@ #include "base/strings/string16.h" #include "base/template_util.h" #include "base/values.h" -#include "browser/api/atom_api_window.h" -#include "common/swap_or_assign.h" -#include "common/v8/scoped_persistent.h" -#include "common/v8/v8_value_converter.h" +#include "atom/browser/api/atom_api_window.h" +#include "atom/common/swap_or_assign.h" +#include "atom/common/v8/scoped_persistent.h" +#include "atom/common/v8/v8_value_converter.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/common/v8/node_common.h b/atom/common/v8/node_common.h similarity index 100% rename from common/v8/node_common.h rename to atom/common/v8/node_common.h diff --git a/common/v8/scoped_persistent.h b/atom/common/v8/scoped_persistent.h similarity index 100% rename from common/v8/scoped_persistent.h rename to atom/common/v8/scoped_persistent.h diff --git a/common/v8/v8_value_converter.cc b/atom/common/v8/v8_value_converter.cc similarity index 99% rename from common/v8/v8_value_converter.cc rename to atom/common/v8/v8_value_converter.cc index 8f87ffada..6d25ab2f8 100644 --- a/common/v8/v8_value_converter.cc +++ b/atom/common/v8/v8_value_converter.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/v8/v8_value_converter.h" +#include "atom/common/v8/v8_value_converter.h" #include diff --git a/common/v8/v8_value_converter.h b/atom/common/v8/v8_value_converter.h similarity index 100% rename from common/v8/v8_value_converter.h rename to atom/common/v8/v8_value_converter.h diff --git a/renderer/api/atom_api_renderer_ipc.cc b/atom/renderer/api/atom_api_renderer_ipc.cc similarity index 92% rename from renderer/api/atom_api_renderer_ipc.cc rename to atom/renderer/api/atom_api_renderer_ipc.cc index 3bc185900..d95acf83f 100644 --- a/renderer/api/atom_api_renderer_ipc.cc +++ b/atom/renderer/api/atom_api_renderer_ipc.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "renderer/api/atom_api_renderer_ipc.h" +#include "atom/renderer/api/atom_api_renderer_ipc.h" -#include "common/api/api_messages.h" -#include "common/v8/native_type_conversions.h" +#include "atom/common/api/api_messages.h" +#include "atom/common/v8/native_type_conversions.h" #include "content/public/renderer/render_view.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" using content::RenderView; using WebKit::WebFrame; diff --git a/renderer/api/atom_api_renderer_ipc.h b/atom/renderer/api/atom_api_renderer_ipc.h similarity index 100% rename from renderer/api/atom_api_renderer_ipc.h rename to atom/renderer/api/atom_api_renderer_ipc.h diff --git a/renderer/api/atom_renderer_bindings.cc b/atom/renderer/api/atom_renderer_bindings.cc similarity index 93% rename from renderer/api/atom_renderer_bindings.cc rename to atom/renderer/api/atom_renderer_bindings.cc index 499410bc0..044a72f72 100644 --- a/renderer/api/atom_renderer_bindings.cc +++ b/atom/renderer/api/atom_renderer_bindings.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "renderer/api/atom_renderer_bindings.h" +#include "atom/renderer/api/atom_renderer_bindings.h" -#include "common/v8/native_type_conversions.h" +#include "atom/common/v8/native_type_conversions.h" #include "content/public/renderer/render_view.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/renderer/api/atom_renderer_bindings.h b/atom/renderer/api/atom_renderer_bindings.h similarity index 95% rename from renderer/api/atom_renderer_bindings.h rename to atom/renderer/api/atom_renderer_bindings.h index 7eb43bf7a..fd63c0ec0 100644 --- a/renderer/api/atom_renderer_bindings.h +++ b/atom/renderer/api/atom_renderer_bindings.h @@ -5,7 +5,7 @@ #ifndef ATOM_RENDERER_API_ATOM_RENDERER_BINDINGS_H_ #define ATOM_RENDERER_API_ATOM_RENDERER_BINDINGS_H_ -#include "common/api/atom_bindings.h" +#include "atom/common/api/atom_bindings.h" #include "base/strings/string16.h" diff --git a/renderer/api/lib/ipc.coffee b/atom/renderer/api/lib/ipc.coffee similarity index 100% rename from renderer/api/lib/ipc.coffee rename to atom/renderer/api/lib/ipc.coffee diff --git a/renderer/api/lib/remote.coffee b/atom/renderer/api/lib/remote.coffee similarity index 100% rename from renderer/api/lib/remote.coffee rename to atom/renderer/api/lib/remote.coffee diff --git a/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc similarity index 89% rename from renderer/atom_render_view_observer.cc rename to atom/renderer/atom_render_view_observer.cc index 69d811bf5..7345a0f8d 100644 --- a/renderer/atom_render_view_observer.cc +++ b/atom/renderer/atom_render_view_observer.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "renderer/atom_render_view_observer.h" +#include "atom/renderer/atom_render_view_observer.h" -#include "common/api/api_messages.h" +#include "atom/common/api/api_messages.h" #include "content/public/renderer/render_view.h" #include "ipc/ipc_message_macros.h" -#include "renderer/api/atom_renderer_bindings.h" -#include "renderer/atom_renderer_client.h" +#include "atom/renderer/api/atom_renderer_bindings.h" +#include "atom/renderer/atom_renderer_client.h" #include "third_party/WebKit/public/web/WebDraggableRegion.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" using WebKit::WebFrame; diff --git a/renderer/atom_render_view_observer.h b/atom/renderer/atom_render_view_observer.h similarity index 100% rename from renderer/atom_render_view_observer.h rename to atom/renderer/atom_render_view_observer.h diff --git a/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc similarity index 95% rename from renderer/atom_renderer_client.cc rename to atom/renderer/atom_renderer_client.cc index d2d095c4f..46f73f273 100644 --- a/renderer/atom_renderer_client.cc +++ b/atom/renderer/atom_renderer_client.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "renderer/atom_renderer_client.h" +#include "atom/renderer/atom_renderer_client.h" #include #include "base/command_line.h" -#include "common/node_bindings.h" -#include "common/options_switches.h" -#include "renderer/api/atom_renderer_bindings.h" -#include "renderer/atom_render_view_observer.h" +#include "atom/common/node_bindings.h" +#include "atom/common/options_switches.h" +#include "atom/renderer/api/atom_renderer_bindings.h" +#include "atom/renderer/atom_render_view_observer.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebFrame.h" -#include "common/v8/node_common.h" +#include "atom/common/v8/node_common.h" namespace atom { diff --git a/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h similarity index 100% rename from renderer/atom_renderer_client.h rename to atom/renderer/atom_renderer_client.h diff --git a/renderer/lib/init.coffee b/atom/renderer/lib/init.coffee similarity index 100% rename from renderer/lib/init.coffee rename to atom/renderer/lib/init.coffee diff --git a/renderer/lib/override.coffee b/atom/renderer/lib/override.coffee similarity index 100% rename from renderer/lib/override.coffee rename to atom/renderer/lib/override.coffee diff --git a/renderer/resources/mac/Info.plist b/atom/renderer/resources/mac/Info.plist similarity index 100% rename from renderer/resources/mac/Info.plist rename to atom/renderer/resources/mac/Info.plist