From 6285500cdc703474a9463d16c9ee6eb73c1baa76 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 26 Aug 2016 15:30:02 -0700 Subject: [PATCH] Sort includes alphabetically --- atom/app/atom_main.cc | 4 ++-- atom/app/atom_main_delegate.cc | 2 +- atom/app/atom_main_delegate.h | 2 +- atom/browser/api/atom_api_auto_updater.cc | 2 +- atom/browser/api/atom_api_protocol.h | 2 +- atom/browser/api/atom_api_session.cc | 8 ++++---- atom/browser/api/atom_api_web_contents.cc | 8 ++++---- atom/browser/api/atom_api_web_contents.h | 2 +- atom/browser/api/atom_api_window.h | 2 +- atom/browser/api/event.h | 2 +- atom/browser/api/frame_subscriber.cc | 2 +- atom/browser/api/frame_subscriber.h | 2 +- atom/browser/atom_browser_context.cc | 6 +++--- atom/browser/atom_download_manager_delegate.cc | 2 +- atom/browser/browser.h | 8 ++++---- atom/browser/browser_win.cc | 4 ++-- atom/browser/common_web_contents_delegate.cc | 4 ++-- atom/browser/common_web_contents_delegate.h | 6 +++--- atom/browser/native_window.cc | 2 +- atom/browser/native_window_views.cc | 8 ++++---- atom/browser/net/atom_network_delegate.h | 4 ++-- atom/browser/net/atom_ssl_config_service.cc | 2 +- atom/browser/osr/osr_render_widget_host_view.cc | 2 +- atom/browser/osr/osr_render_widget_host_view.h | 6 +++--- atom/browser/relauncher_mac.cc | 2 +- atom/browser/ui/drag_util_views.cc | 2 +- atom/browser/ui/file_dialog_win.cc | 4 ++-- atom/browser/ui/message_box_win.cc | 2 +- atom/browser/ui/views/global_menu_bar_x11.h | 2 +- atom/browser/ui/win/notify_icon.cc | 6 +++--- atom/browser/ui/win/notify_icon.h | 4 ++-- atom/browser/ui/win/taskbar_host.cc | 4 ++-- atom/browser/ui/win/taskbar_host.h | 2 +- atom/browser/ui/x/x_window_utils.cc | 2 +- atom/browser/web_contents_preferences.cc | 2 +- atom/browser/web_dialog_helper.cc | 2 +- atom/browser/window_list.h | 2 +- atom/common/api/atom_api_asar.cc | 1 + atom/common/api/atom_api_key_weak_map.h | 2 +- atom/common/api/atom_api_native_image.cc | 4 ++-- atom/common/api/atom_api_shell.cc | 2 +- atom/common/api/atom_bindings.cc | 5 ++--- atom/common/asar/archive.cc | 2 +- atom/common/crash_reporter/crash_reporter.cc | 2 +- atom/common/crash_reporter/crash_reporter_linux.cc | 2 +- atom/common/crash_reporter/win/crash_service.h | 2 +- atom/common/native_mate_converters/content_converter.h | 2 +- atom/common/native_mate_converters/gfx_converter.cc | 4 ++-- atom/common/native_mate_converters/net_converter.cc | 4 ++-- atom/common/native_mate_converters/v8_value_converter.h | 2 +- atom/common/node_bindings.cc | 2 +- atom/common/node_bindings_linux.h | 2 +- atom/common/platform_util_win.cc | 4 ++-- atom/renderer/atom_render_view_observer.cc | 6 +++--- atom/renderer/atom_renderer_client.cc | 4 ++-- atom/renderer/node_array_buffer_bridge.cc | 2 +- 56 files changed, 91 insertions(+), 91 deletions(-) diff --git a/atom/app/atom_main.cc b/atom/app/atom_main.cc index 387b5167f..23ec14822 100644 --- a/atom/app/atom_main.cc +++ b/atom/app/atom_main.cc @@ -7,10 +7,10 @@ #include #if defined(OS_WIN) -#include +#include #include #include -#include +#include #include "atom/app/atom_main_delegate.h" #include "atom/common/crash_reporter/win/crash_service_main.h" diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc index f4e0b6044..2d31b1c91 100644 --- a/atom/app/atom_main_delegate.cc +++ b/atom/app/atom_main_delegate.cc @@ -4,8 +4,8 @@ #include "atom/app/atom_main_delegate.h" -#include #include +#include #include "atom/app/atom_content_client.h" #include "atom/browser/atom_browser_client.h" diff --git a/atom/app/atom_main_delegate.h b/atom/app/atom_main_delegate.h index 58a380bd7..64207ae79 100644 --- a/atom/app/atom_main_delegate.h +++ b/atom/app/atom_main_delegate.h @@ -7,8 +7,8 @@ #include -#include "brightray/common/main_delegate.h" #include "brightray/common/content_client.h" +#include "brightray/common/main_delegate.h" namespace atom { diff --git a/atom/browser/api/atom_api_auto_updater.cc b/atom/browser/api/atom_api_auto_updater.cc index 83e5505a1..67079abf2 100644 --- a/atom/browser/api/atom_api_auto_updater.cc +++ b/atom/browser/api/atom_api_auto_updater.cc @@ -4,12 +4,12 @@ #include "atom/browser/api/atom_api_auto_updater.h" -#include "base/time/time.h" #include "atom/browser/browser.h" #include "atom/browser/native_window.h" #include "atom/browser/window_list.h" #include "atom/common/native_mate_converters/callback.h" #include "atom/common/node_includes.h" +#include "base/time/time.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" diff --git a/atom/browser/api/atom_api_protocol.h b/atom/browser/api/atom_api_protocol.h index 2e69e781c..3ad039c1b 100644 --- a/atom/browser/api/atom_api_protocol.h +++ b/atom/browser/api/atom_api_protocol.h @@ -5,8 +5,8 @@ #ifndef ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_ #define ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_ -#include #include +#include #include #include "atom/browser/api/trackable_object.h" diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index dd98db843..1bd944a3c 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/atom/browser/api/atom_api_session.cc @@ -12,27 +12,27 @@ #include "atom/browser/api/atom_api_download_item.h" #include "atom/browser/api/atom_api_protocol.h" #include "atom/browser/api/atom_api_web_request.h" -#include "atom/browser/browser.h" #include "atom/browser/atom_browser_context.h" #include "atom/browser/atom_browser_main_parts.h" #include "atom/browser/atom_permission_manager.h" +#include "atom/browser/browser.h" #include "atom/browser/net/atom_cert_verifier.h" #include "atom/common/native_mate_converters/callback.h" #include "atom/common/native_mate_converters/content_converter.h" -#include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/file_path_converter.h" +#include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/net_converter.h" #include "atom/common/native_mate_converters/value_converter.h" #include "atom/common/node_includes.h" #include "base/files/file_path.h" #include "base/guid.h" -#include "components/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/threading/thread_task_runner_handle.h" #include "brightray/browser/net/devtools_network_conditions.h" #include "brightray/browser/net/devtools_network_controller_handle.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" #include "native_mate/dictionary.h" @@ -42,8 +42,8 @@ #include "net/dns/host_cache.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_auth_preferences.h" -#include "net/proxy/proxy_service.h" #include "net/proxy/proxy_config_service_fixed.h" +#include "net/proxy/proxy_service.h" #include "net/url_request/static_http_user_agent_settings.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index d9722f3cc..f67926978 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -18,8 +18,8 @@ #include "atom/browser/native_window.h" #include "atom/browser/net/atom_network_delegate.h" #include "atom/browser/osr/osr_output_device.h" -#include "atom/browser/osr/osr_web_contents_view.h" #include "atom/browser/osr/osr_render_widget_host_view.h" +#include "atom/browser/osr/osr_web_contents_view.h" #include "atom/browser/ui/drag_util.h" #include "atom/browser/web_contents_permission_helper.h" #include "atom/browser/web_contents_preferences.h" @@ -43,8 +43,8 @@ #include "base/strings/utf_string_conversions.h" #include "brightray/browser/inspectable_web_contents.h" #include "brightray/browser/inspectable_web_contents_view.h" -#include "chrome/browser/printing/print_view_manager_basic.h" #include "chrome/browser/printing/print_preview_message_handler.h" +#include "chrome/browser/printing/print_view_manager_basic.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/common/view_messages.h" @@ -61,16 +61,16 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/resource_request_details.h" #include "content/public/browser/service_worker_context.h" -#include "content/public/browser/storage_partition.h" #include "content/public/browser/site_instance.h" +#include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/common/context_menu_params.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_context.h" -#include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/WebKit/public/web/WebFindOptions.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/display/screen.h" #if !defined(OS_MACOSX) diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h index 4fbe7247e..a4d50efd3 100644 --- a/atom/browser/api/atom_api_web_contents.h +++ b/atom/browser/api/atom_api_web_contents.h @@ -12,9 +12,9 @@ #include "atom/browser/api/save_page_handler.h" #include "atom/browser/api/trackable_object.h" #include "atom/browser/common_web_contents_delegate.h" +#include "content/common/cursors/webcursor.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/favicon_url.h" -#include "content/common/cursors/webcursor.h" #include "native_mate/handle.h" #include "ui/gfx/image/image.h" diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h index 9dc64fdb8..406e47d90 100644 --- a/atom/browser/api/atom_api_window.h +++ b/atom/browser/api/atom_api_window.h @@ -10,13 +10,13 @@ #include #include -#include "ui/gfx/image/image.h" #include "atom/browser/api/trackable_object.h" #include "atom/browser/native_window.h" #include "atom/browser/native_window_observer.h" #include "atom/common/api/atom_api_native_image.h" #include "atom/common/key_weak_map.h" #include "native_mate/handle.h" +#include "ui/gfx/image/image.h" class GURL; diff --git a/atom/browser/api/event.h b/atom/browser/api/event.h index f08802b4e..d73bd2f64 100644 --- a/atom/browser/api/event.h +++ b/atom/browser/api/event.h @@ -6,8 +6,8 @@ #define ATOM_BROWSER_API_EVENT_H_ #include "content/public/browser/web_contents_observer.h" -#include "native_mate/wrappable.h" #include "native_mate/handle.h" +#include "native_mate/wrappable.h" namespace IPC { class Message; diff --git a/atom/browser/api/frame_subscriber.cc b/atom/browser/api/frame_subscriber.cc index d6d2cf759..1e80acd92 100644 --- a/atom/browser/api/frame_subscriber.cc +++ b/atom/browser/api/frame_subscriber.cc @@ -4,9 +4,9 @@ #include "atom/browser/api/frame_subscriber.h" -#include "base/bind.h" #include "atom/common/native_mate_converters/gfx_converter.h" #include "atom/common/node_includes.h" +#include "base/bind.h" #include "content/public/browser/render_widget_host.h" namespace atom { diff --git a/atom/browser/api/frame_subscriber.h b/atom/browser/api/frame_subscriber.h index 0da554ac4..f1c7f0af4 100644 --- a/atom/browser/api/frame_subscriber.h +++ b/atom/browser/api/frame_subscriber.h @@ -7,9 +7,9 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" +#include "content/public/browser/readback_types.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/render_widget_host_view_frame_subscriber.h" -#include "content/public/browser/readback_types.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/geometry/size.h" #include "v8/include/v8.h" diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc index f9bfe1a94..c3945e48a 100644 --- a/atom/browser/atom_browser_context.cc +++ b/atom/browser/atom_browser_context.cc @@ -7,14 +7,14 @@ #include "atom/browser/api/atom_api_protocol.h" #include "atom/browser/atom_browser_main_parts.h" #include "atom/browser/atom_download_manager_delegate.h" +#include "atom/browser/atom_permission_manager.h" #include "atom/browser/browser.h" +#include "atom/browser/net/asar/asar_protocol_handler.h" #include "atom/browser/net/atom_cert_verifier.h" #include "atom/browser/net/atom_network_delegate.h" #include "atom/browser/net/atom_ssl_config_service.h" #include "atom/browser/net/atom_url_request_job_factory.h" -#include "atom/browser/net/asar/asar_protocol_handler.h" #include "atom/browser/net/http_protocol_handler.h" -#include "atom/browser/atom_permission_manager.h" #include "atom/browser/web_view_manager.h" #include "atom/common/atom_version.h" #include "atom/common/chrome_version.h" @@ -36,8 +36,8 @@ #include "net/ftp/ftp_network_layer.h" #include "net/url_request/data_protocol_handler.h" #include "net/url_request/ftp_protocol_handler.h" -#include "net/url_request/url_request_intercepting_job_factory.h" #include "net/url_request/url_request_context.h" +#include "net/url_request/url_request_intercepting_job_factory.h" #include "url/url_constants.h" using content::BrowserThread; diff --git a/atom/browser/atom_download_manager_delegate.cc b/atom/browser/atom_download_manager_delegate.cc index 68095c11e..7f5605052 100644 --- a/atom/browser/atom_download_manager_delegate.cc +++ b/atom/browser/atom_download_manager_delegate.cc @@ -12,8 +12,8 @@ #include "atom/browser/ui/file_dialog.h" #include "base/bind.h" #include "base/files/file_util.h" -#include "components/prefs/pref_service.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" diff --git a/atom/browser/browser.h b/atom/browser/browser.h index b8b151d7b..9fb8afe32 100644 --- a/atom/browser/browser.h +++ b/atom/browser/browser.h @@ -8,12 +8,12 @@ #include #include -#include "base/macros.h" -#include "base/compiler_specific.h" -#include "base/observer_list.h" -#include "base/strings/string16.h" #include "atom/browser/browser_observer.h" #include "atom/browser/window_list_observer.h" +#include "base/compiler_specific.h" +#include "base/macros.h" +#include "base/observer_list.h" +#include "base/strings/string16.h" #include "native_mate/arguments.h" #if defined(OS_WIN) diff --git a/atom/browser/browser_win.cc b/atom/browser/browser_win.cc index 40db4be9e..a2dcb0576 100644 --- a/atom/browser/browser_win.cc +++ b/atom/browser/browser_win.cc @@ -6,9 +6,9 @@ #include #include -#include #include #include +#include #include "atom/common/atom_version.h" #include "atom/common/native_mate_converters/string16_converter.h" @@ -19,8 +19,8 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/win/win_util.h" #include "base/win/registry.h" +#include "base/win/win_util.h" #include "base/win/windows_version.h" namespace atom { diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc index f2f0ee8ae..50e7217fd 100644 --- a/atom/browser/common_web_contents_delegate.cc +++ b/atom/browser/common_web_contents_delegate.cc @@ -16,12 +16,12 @@ #include "atom/browser/web_dialog_helper.h" #include "atom/common/atom_constants.h" #include "base/files/file_util.h" -#include "components/prefs/pref_service.h" -#include "components/prefs/scoped_user_pref_update.h" #include "chrome/browser/printing/print_preview_message_handler.h" #include "chrome/browser/printing/print_view_manager_basic.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/render_process_host.h" diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h index 1746d63b2..c369f8986 100644 --- a/atom/browser/common_web_contents_delegate.h +++ b/atom/browser/common_web_contents_delegate.h @@ -9,10 +9,10 @@ #include #include -#include "brightray/browser/inspectable_web_contents_impl.h" -#include "brightray/browser/inspectable_web_contents_delegate.h" -#include "brightray/browser/inspectable_web_contents_view_delegate.h" #include "brightray/browser/devtools_file_system_indexer.h" +#include "brightray/browser/inspectable_web_contents_delegate.h" +#include "brightray/browser/inspectable_web_contents_impl.h" +#include "brightray/browser/inspectable_web_contents_view_delegate.h" #include "content/public/browser/web_contents_delegate.h" using brightray::DevToolsFileSystemIndexer; diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index a3404ebdf..3b836d9cc 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -18,11 +18,11 @@ #include "atom/common/options_switches.h" #include "base/files/file_util.h" #include "base/json/json_writer.h" -#include "components/prefs/pref_service.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "brightray/browser/inspectable_web_contents.h" #include "brightray/browser/inspectable_web_contents_view.h" +#include "components/prefs/pref_service.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/plugin_service.h" diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc index 43b6d6508..ef5ae30a8 100644 --- a/atom/browser/native_window_views.cc +++ b/atom/browser/native_window_views.cc @@ -26,16 +26,16 @@ #include "ui/views/background.h" #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" #include "ui/views/controls/webview/webview.h" -#include "ui/views/window/client_view.h" #include "ui/views/widget/native_widget_private.h" #include "ui/views/widget/widget.h" -#include "ui/wm/core/window_util.h" +#include "ui/views/window/client_view.h" #include "ui/wm/core/shadow_types.h" +#include "ui/wm/core/window_util.h" #if defined(USE_X11) #include "atom/browser/browser.h" -#include "atom/browser/ui/views/global_menu_bar_x11.h" #include "atom/browser/ui/views/frameless_view.h" +#include "atom/browser/ui/views/global_menu_bar_x11.h" #include "atom/browser/ui/views/native_frame_view.h" #include "atom/browser/ui/x/event_disabler.h" #include "atom/browser/ui/x/window_state_watcher.h" @@ -51,9 +51,9 @@ #include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h" #include "skia/ext/skia_utils_win.h" #include "ui/base/win/shell.h" -#include "ui/display/win/screen_win.h" #include "ui/display/display.h" #include "ui/display/screen.h" +#include "ui/display/win/screen_win.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #endif diff --git a/atom/browser/net/atom_network_delegate.h b/atom/browser/net/atom_network_delegate.h index 62653df0b..3f1bff81c 100644 --- a/atom/browser/net/atom_network_delegate.h +++ b/atom/browser/net/atom_network_delegate.h @@ -9,15 +9,15 @@ #include #include -#include "brightray/browser/network_delegate.h" #include "base/callback.h" #include "base/synchronization/lock.h" #include "base/values.h" +#include "brightray/browser/network_delegate.h" +#include "content/public/browser/resource_request_info.h" #include "extensions/common/url_pattern.h" #include "net/base/net_errors.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" -#include "content/public/browser/resource_request_info.h" namespace extensions { class URLPattern; diff --git a/atom/browser/net/atom_ssl_config_service.cc b/atom/browser/net/atom_ssl_config_service.cc index c306a8a39..1c9d39258 100644 --- a/atom/browser/net/atom_ssl_config_service.cc +++ b/atom/browser/net/atom_ssl_config_service.cc @@ -7,9 +7,9 @@ #include #include +#include "atom/common/options_switches.h" #include "base/command_line.h" #include "base/strings/string_split.h" -#include "atom/common/options_switches.h" #include "content/public/browser/browser_thread.h" #include "net/socket/ssl_client_socket.h" #include "net/ssl/ssl_cipher_suite_names.h" diff --git a/atom/browser/osr/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc index 71a0a8d46..e94e4e835 100644 --- a/atom/browser/osr/osr_render_widget_host_view.cc +++ b/atom/browser/osr/osr_render_widget_host_view.cc @@ -14,8 +14,8 @@ #include "cc/output/copy_output_request.h" #include "cc/scheduler/delay_based_time_source.h" #include "components/display_compositor/gl_helper.h" -#include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_delegate.h" +#include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/common/view_messages.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/context_factory.h" diff --git a/atom/browser/osr/osr_render_widget_host_view.h b/atom/browser/osr/osr_render_widget_host_view.h index 4bd652a08..7c285c476 100644 --- a/atom/browser/osr/osr_render_widget_host_view.h +++ b/atom/browser/osr/osr_render_widget_host_view.h @@ -17,18 +17,18 @@ #include "base/process/kill.h" #include "base/threading/thread.h" #include "base/time/time.h" -#include "cc/scheduler/begin_frame_source.h" #include "cc/output/compositor_frame.h" +#include "cc/scheduler/begin_frame_source.h" #include "content/browser/renderer_host/delegated_frame_host.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_view_base.h" #include "content/browser/renderer_host/resize_lock.h" +#include "third_party/WebKit/public/platform/WebVector.h" +#include "ui/base/ime/text_input_client.h" #include "ui/compositor/compositor.h" #include "ui/compositor/layer_delegate.h" #include "ui/compositor/layer_owner.h" -#include "ui/base/ime/text_input_client.h" #include "ui/gfx/geometry/point.h" -#include "third_party/WebKit/public/platform/WebVector.h" #if defined(OS_WIN) #include "ui/gfx/win/window_impl.h" diff --git a/atom/browser/relauncher_mac.cc b/atom/browser/relauncher_mac.cc index 6e2885024..5aee5d2d9 100644 --- a/atom/browser/relauncher_mac.cc +++ b/atom/browser/relauncher_mac.cc @@ -11,9 +11,9 @@ #include "base/files/file_util.h" #include "base/logging.h" -#include "base/process/launch.h" #include "base/mac/mac_logging.h" #include "base/posix/eintr_wrapper.h" +#include "base/process/launch.h" #include "base/strings/sys_string_conversions.h" namespace relauncher { diff --git a/atom/browser/ui/drag_util_views.cc b/atom/browser/ui/drag_util_views.cc index 9a035bf08..058aed443 100644 --- a/atom/browser/ui/drag_util_views.cc +++ b/atom/browser/ui/drag_util_views.cc @@ -9,8 +9,8 @@ #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/file_info.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/gfx/geometry/point.h" #include "ui/display/screen.h" +#include "ui/gfx/geometry/point.h" #include "ui/views/widget/widget.h" #include "ui/wm/public/drag_drop_client.h" diff --git a/atom/browser/ui/file_dialog_win.cc b/atom/browser/ui/file_dialog_win.cc index ff7d8f972..8e9ae6d49 100644 --- a/atom/browser/ui/file_dialog_win.cc +++ b/atom/browser/ui/file_dialog_win.cc @@ -5,16 +5,16 @@ #include "atom/browser/ui/file_dialog.h" #include -#include #include #include +#include #include "atom/browser/native_window_views.h" #include "atom/browser/unresponsive_suppressor.h" #include "base/files/file_util.h" #include "base/i18n/case_conversion.h" -#include "base/strings/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "base/win/registry.h" diff --git a/atom/browser/ui/message_box_win.cc b/atom/browser/ui/message_box_win.cc index e5615fb1f..d92caa17e 100644 --- a/atom/browser/ui/message_box_win.cc +++ b/atom/browser/ui/message_box_win.cc @@ -4,8 +4,8 @@ #include "atom/browser/ui/message_box.h" -#include #include +#include #include #include diff --git a/atom/browser/ui/views/global_menu_bar_x11.h b/atom/browser/ui/views/global_menu_bar_x11.h index 9bb4dd338..8887ab57a 100644 --- a/atom/browser/ui/views/global_menu_bar_x11.h +++ b/atom/browser/ui/views/global_menu_bar_x11.h @@ -8,8 +8,8 @@ #include #include "atom/browser/ui/atom_menu_model.h" -#include "base/macros.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/glib/glib_signal.h" #include "ui/gfx/native_widget_types.h" diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc index e62b682e3..df9a65ddd 100644 --- a/atom/browser/ui/win/notify_icon.cc +++ b/atom/browser/ui/win/notify_icon.cc @@ -9,11 +9,11 @@ #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/image/image.h" -#include "ui/gfx/geometry/point.h" -#include "ui/gfx/geometry/rect.h" #include "ui/display/screen.h" #include "ui/display/win/screen_win.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/image/image.h" #include "ui/views/controls/menu/menu_runner.h" namespace atom { diff --git a/atom/browser/ui/win/notify_icon.h b/atom/browser/ui/win/notify_icon.h index ae6c9ca8a..e4e0dec5e 100644 --- a/atom/browser/ui/win/notify_icon.h +++ b/atom/browser/ui/win/notify_icon.h @@ -5,14 +5,14 @@ #ifndef ATOM_BROWSER_UI_WIN_NOTIFY_ICON_H_ #define ATOM_BROWSER_UI_WIN_NOTIFY_ICON_H_ -#include #include +#include #include #include "atom/browser/ui/tray_icon.h" -#include "base/macros.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/win/scoped_gdi_object.h" namespace gfx { diff --git a/atom/browser/ui/win/taskbar_host.cc b/atom/browser/ui/win/taskbar_host.cc index 913e97c9d..8ca6fa48a 100644 --- a/atom/browser/ui/win/taskbar_host.cc +++ b/atom/browser/ui/win/taskbar_host.cc @@ -6,13 +6,13 @@ #include +#include "atom/browser/native_window.h" #include "base/stl_util.h" -#include "base/win/scoped_gdi_object.h" #include "base/strings/utf_string_conversions.h" +#include "base/win/scoped_gdi_object.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/display/win/screen_win.h" #include "ui/gfx/icon_util.h" -#include "atom/browser/native_window.h" namespace atom { diff --git a/atom/browser/ui/win/taskbar_host.h b/atom/browser/ui/win/taskbar_host.h index cbfcff57f..e5acaa787 100644 --- a/atom/browser/ui/win/taskbar_host.h +++ b/atom/browser/ui/win/taskbar_host.h @@ -11,11 +11,11 @@ #include #include +#include "atom/browser/native_window.h" #include "base/callback.h" #include "base/win/scoped_comptr.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/image/image.h" -#include "atom/browser/native_window.h" namespace atom { diff --git a/atom/browser/ui/x/x_window_utils.cc b/atom/browser/ui/x/x_window_utils.cc index 48e8bc977..8f5e07770 100644 --- a/atom/browser/ui/x/x_window_utils.cc +++ b/atom/browser/ui/x/x_window_utils.cc @@ -9,8 +9,8 @@ #include "base/environment.h" #include "base/strings/string_util.h" #include "dbus/bus.h" -#include "dbus/object_proxy.h" #include "dbus/message.h" +#include "dbus/object_proxy.h" #include "ui/base/x/x11_util.h" namespace atom { diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc index 7faf8c889..5628c19e9 100644 --- a/atom/browser/web_contents_preferences.cc +++ b/atom/browser/web_contents_preferences.cc @@ -14,12 +14,12 @@ #include "atom/common/options_switches.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" +#include "cc/base/switches.h" #include "content/public/browser/render_process_host.h" #include "content/public/common/content_switches.h" #include "content/public/common/web_preferences.h" #include "native_mate/dictionary.h" #include "net/base/filename_util.h" -#include "cc/base/switches.h" #if defined(OS_WIN) #include "ui/gfx/switches.h" diff --git a/atom/browser/web_dialog_helper.cc b/atom/browser/web_dialog_helper.cc index 2d2a9e5db..fae1aa650 100644 --- a/atom/browser/web_dialog_helper.cc +++ b/atom/browser/web_dialog_helper.cc @@ -13,9 +13,9 @@ #include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" -#include "components/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/file_chooser_file_info.h" diff --git a/atom/browser/window_list.h b/atom/browser/window_list.h index 3dd87b2c3..d9b307352 100644 --- a/atom/browser/window_list.h +++ b/atom/browser/window_list.h @@ -7,8 +7,8 @@ #include -#include "base/macros.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/observer_list.h" namespace atom { diff --git a/atom/common/api/atom_api_asar.cc b/atom/common/api/atom_api_asar.cc index 012d8f3c1..dc421f0a0 100644 --- a/atom/common/api/atom_api_asar.cc +++ b/atom/common/api/atom_api_asar.cc @@ -7,6 +7,7 @@ #include #include "atom_natives.h" // NOLINT: This file is generated with coffee2c. + #include "atom/common/asar/archive.h" #include "atom/common/native_mate_converters/callback.h" #include "atom/common/native_mate_converters/file_path_converter.h" diff --git a/atom/common/api/atom_api_key_weak_map.h b/atom/common/api/atom_api_key_weak_map.h index 743b719e4..b8babe151 100644 --- a/atom/common/api/atom_api_key_weak_map.h +++ b/atom/common/api/atom_api_key_weak_map.h @@ -6,8 +6,8 @@ #define ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_ #include "atom/common/key_weak_map.h" -#include "native_mate/object_template_builder.h" #include "native_mate/handle.h" +#include "native_mate/object_template_builder.h" #include "native_mate/wrappable.h" namespace atom { diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc index b08c9a95d..d19b57b28 100644 --- a/atom/common/api/atom_api_native_image.cc +++ b/atom/common/api/atom_api_native_image.cc @@ -14,18 +14,18 @@ #include "atom/common/node_includes.h" #include "base/base64.h" #include "base/files/file_util.h" -#include "base/strings/string_util.h" #include "base/strings/pattern.h" +#include "base/strings/string_util.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" #include "net/base/data_url.h" +#include "third_party/skia/include/core/SkPixelRef.h" #include "ui/base/layout.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_util.h" -#include "third_party/skia/include/core/SkPixelRef.h" #if defined(OS_WIN) #include "atom/common/asar/archive.h" diff --git a/atom/common/api/atom_api_shell.cc b/atom/common/api/atom_api_shell.cc index 2d9d6e026..03e8ed32e 100644 --- a/atom/common/api/atom_api_shell.cc +++ b/atom/common/api/atom_api_shell.cc @@ -4,11 +4,11 @@ #include -#include "atom/common/platform_util.h" #include "atom/common/native_mate_converters/file_path_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/string16_converter.h" #include "atom/common/node_includes.h" +#include "atom/common/platform_util.h" #include "native_mate/dictionary.h" #if defined(OS_WIN) diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc index b5a51ad50..cf80d6444 100644 --- a/atom/common/api/atom_bindings.cc +++ b/atom/common/api/atom_bindings.cc @@ -5,18 +5,17 @@ #include "atom/common/api/atom_bindings.h" #include -#include #include +#include #include "atom/common/atom_version.h" #include "atom/common/chrome_version.h" #include "atom/common/native_mate_converters/string16_converter.h" +#include "atom/common/node_includes.h" #include "base/logging.h" #include "base/process/process_metrics.h" #include "native_mate/dictionary.h" -#include "atom/common/node_includes.h" - namespace atom { namespace { diff --git a/atom/common/asar/archive.cc b/atom/common/asar/archive.cc index e622effe5..a3a02996d 100644 --- a/atom/common/asar/archive.cc +++ b/atom/common/asar/archive.cc @@ -10,9 +10,9 @@ #include "atom/common/asar/scoped_temporary_file.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/json/json_reader.h" #include "base/logging.h" #include "base/pickle.h" -#include "base/json/json_reader.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc index f4f0ff9b7..57bd5ef18 100644 --- a/atom/common/crash_reporter/crash_reporter.cc +++ b/atom/common/crash_reporter/crash_reporter.cc @@ -8,8 +8,8 @@ #include "atom/common/atom_version.h" #include "base/command_line.h" #include "base/files/file_util.h" -#include "base/strings/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "content/public/common/content_switches.h" namespace crash_reporter { diff --git a/atom/common/crash_reporter/crash_reporter_linux.cc b/atom/common/crash_reporter/crash_reporter_linux.cc index 6fe69f486..c25f00582 100644 --- a/atom/common/crash_reporter/crash_reporter_linux.cc +++ b/atom/common/crash_reporter/crash_reporter_linux.cc @@ -15,8 +15,8 @@ #include "base/files/file_util.h" #include "base/linux_util.h" #include "base/logging.h" -#include "base/process/memory.h" #include "base/memory/singleton.h" +#include "base/process/memory.h" #include "base/strings/stringprintf.h" #include "vendor/breakpad/src/client/linux/handler/exception_handler.h" #include "vendor/breakpad/src/common/linux/linux_libc_support.h" diff --git a/atom/common/crash_reporter/win/crash_service.h b/atom/common/crash_reporter/win/crash_service.h index c05e0d5bf..634478ef6 100644 --- a/atom/common/crash_reporter/win/crash_service.h +++ b/atom/common/crash_reporter/win/crash_service.h @@ -7,8 +7,8 @@ #include -#include "base/macros.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/synchronization/lock.h" namespace google_breakpad { diff --git a/atom/common/native_mate_converters/content_converter.h b/atom/common/native_mate_converters/content_converter.h index 522961a7e..dd27450b3 100644 --- a/atom/common/native_mate_converters/content_converter.h +++ b/atom/common/native_mate_converters/content_converter.h @@ -10,8 +10,8 @@ #include "content/public/browser/permission_type.h" #include "content/public/common/menu_item.h" #include "content/public/common/stop_find_action.h" -#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h" #include "native_mate/converter.h" +#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h" namespace content { struct ContextMenuParams; diff --git a/atom/common/native_mate_converters/gfx_converter.cc b/atom/common/native_mate_converters/gfx_converter.cc index db6a181cc..7e2141418 100644 --- a/atom/common/native_mate_converters/gfx_converter.cc +++ b/atom/common/native_mate_converters/gfx_converter.cc @@ -5,11 +5,11 @@ #include "atom/common/native_mate_converters/gfx_converter.h" #include "native_mate/dictionary.h" +#include "ui/display/display.h" +#include "ui/display/screen.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" -#include "ui/display/display.h" -#include "ui/display/screen.h" namespace mate { diff --git a/atom/common/native_mate_converters/net_converter.cc b/atom/common/native_mate_converters/net_converter.cc index bc97f3a75..ff97cd63e 100644 --- a/atom/common/native_mate_converters/net_converter.cc +++ b/atom/common/native_mate_converters/net_converter.cc @@ -7,11 +7,11 @@ #include #include -#include "atom/common/node_includes.h" #include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/value_converter.h" -#include "base/values.h" +#include "atom/common/node_includes.h" #include "base/strings/string_number_conversions.h" +#include "base/values.h" #include "native_mate/dictionary.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" diff --git a/atom/common/native_mate_converters/v8_value_converter.h b/atom/common/native_mate_converters/v8_value_converter.h index 0e5c4d9f5..d4ddfd130 100644 --- a/atom/common/native_mate_converters/v8_value_converter.h +++ b/atom/common/native_mate_converters/v8_value_converter.h @@ -5,8 +5,8 @@ #ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_ #define ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_ -#include "base/macros.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "v8/include/v8.h" namespace base { diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc index d1db83b70..dd265ee00 100644 --- a/atom/common/node_bindings.cc +++ b/atom/common/node_bindings.cc @@ -11,8 +11,8 @@ #include "atom/common/api/locker.h" #include "atom/common/atom_command_line.h" #include "atom/common/native_mate_converters/file_path_converter.h" -#include "base/command_line.h" #include "base/base_paths.h" +#include "base/command_line.h" #include "base/environment.h" #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" diff --git a/atom/common/node_bindings_linux.h b/atom/common/node_bindings_linux.h index 3bbea9f9d..341bf133e 100644 --- a/atom/common/node_bindings_linux.h +++ b/atom/common/node_bindings_linux.h @@ -5,8 +5,8 @@ #ifndef ATOM_COMMON_NODE_BINDINGS_LINUX_H_ #define ATOM_COMMON_NODE_BINDINGS_LINUX_H_ -#include "base/compiler_specific.h" #include "atom/common/node_bindings.h" +#include "base/compiler_specific.h" namespace atom { diff --git a/atom/common/platform_util_win.cc b/atom/common/platform_util_win.cc index 0795fcb72..2cedad371 100644 --- a/atom/common/platform_util_win.cc +++ b/atom/common/platform_util_win.cc @@ -4,13 +4,13 @@ #include "atom/common/platform_util.h" -#include #include -#include #include +#include #include #include #include +#include #include "base/bind.h" #include "base/bind_helpers.h" diff --git a/atom/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc index 45a41eef8..37f408f74 100644 --- a/atom/renderer/atom_render_view_observer.cc +++ b/atom/renderer/atom_render_view_observer.cc @@ -20,16 +20,16 @@ #include "base/strings/string_number_conversions.h" #include "content/public/renderer/render_view.h" #include "ipc/ipc_message_macros.h" +#include "native_mate/dictionary.h" #include "net/base/net_module.h" #include "net/grit/net_resources.h" -#include "third_party/WebKit/public/web/WebDraggableRegion.h" #include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebDraggableRegion.h" #include "third_party/WebKit/public/web/WebFrame.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebView.h" #include "ui/base/resource/resource_bundle.h" -#include "native_mate/dictionary.h" namespace atom { diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc index d2c341fa2..02b374abe 100644 --- a/atom/renderer/atom_renderer_client.cc +++ b/atom/renderer/atom_renderer_client.cc @@ -34,12 +34,12 @@ #include "third_party/WebKit/public/web/WebCustomElement.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebFrameWidget.h" +#include "third_party/WebKit/public/web/WebKit.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebPluginParams.h" -#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "third_party/WebKit/public/web/WebScriptSource.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h" -#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "third_party/WebKit/public/web/WebView.h" #if defined(OS_MACOSX) diff --git a/atom/renderer/node_array_buffer_bridge.cc b/atom/renderer/node_array_buffer_bridge.cc index 61ad25222..14e84d639 100644 --- a/atom/renderer/node_array_buffer_bridge.cc +++ b/atom/renderer/node_array_buffer_bridge.cc @@ -4,8 +4,8 @@ #include "atom/renderer/node_array_buffer_bridge.h" -#include "base/macros.h" #include "atom/common/node_includes.h" +#include "base/macros.h" #include "native_mate/converter.h" #include "third_party/WebKit/public/web/WebArrayBuffer.h" #include "third_party/WebKit/public/web/WebArrayBufferConverter.h"