From b6ac06c022492dd6e694fcec0ee8757ae975718b Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Sun, 16 Mar 2014 09:37:04 +0800 Subject: [PATCH] Order header files. --- atom/browser/net/atom_url_request_context_getter.cc | 2 +- atom/browser/resources/mac/Info.plist | 2 ++ atom/browser/ui/file_dialog_gtk.cc | 2 +- atom/browser/ui/file_dialog_mac.mm | 4 ++-- atom/browser/ui/file_dialog_win.cc | 2 +- atom/browser/ui/message_box_gtk.cc | 2 +- atom/browser/ui/message_box_mac.mm | 2 +- atom/browser/ui/message_box_win.cc | 2 +- atom/browser/ui/win/menu_2.h | 2 +- atom/browser/ui/win/native_menu_win.cc | 2 +- atom/browser/window_list.cc | 2 +- atom/common/api/api_messages.h | 2 +- atom/common/api/atom_api_event_emitter.cc | 2 +- atom/common/api/atom_api_id_weak_map.cc | 2 +- atom/common/api/atom_api_id_weak_map.h | 3 ++- atom/common/api/atom_api_shell.cc | 2 +- atom/common/api/atom_bindings.cc | 2 +- atom/common/api/object_life_monitor.h | 2 +- atom/common/crash_reporter/crash_reporter.cc | 2 +- atom/common/crash_reporter/crash_reporter_linux.h | 4 ++-- atom/common/crash_reporter/crash_reporter_mac.h | 2 +- atom/common/crash_reporter/crash_reporter_win.h | 2 +- atom/common/crash_reporter/win/crash_service_main.cc | 2 +- atom/common/node_bindings.cc | 2 +- atom/common/node_bindings_mac.h | 2 +- atom/common/node_bindings_win.h | 2 +- atom/common/v8/native_type_conversions.h | 8 ++++---- atom/renderer/atom_render_view_observer.cc | 4 ++-- atom/renderer/atom_renderer_client.cc | 2 +- 29 files changed, 37 insertions(+), 34 deletions(-) diff --git a/atom/browser/net/atom_url_request_context_getter.cc b/atom/browser/net/atom_url_request_context_getter.cc index 9a4dbf89f..21eb11d38 100644 --- a/atom/browser/net/atom_url_request_context_getter.cc +++ b/atom/browser/net/atom_url_request_context_getter.cc @@ -6,10 +6,10 @@ #include +#include "atom/browser/net/atom_url_request_job_factory.h" #include "base/strings/string_util.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/worker_pool.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/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist index 519349c0c..bc76eda42 100644 --- a/atom/browser/resources/mac/Info.plist +++ b/atom/browser/resources/mac/Info.plist @@ -16,5 +16,7 @@ MainMenu NSPrincipalClass AtomApplication + NSSupportsAutomaticGraphicsSwitching + diff --git a/atom/browser/ui/file_dialog_gtk.cc b/atom/browser/ui/file_dialog_gtk.cc index d9cef0425..6c76c2991 100644 --- a/atom/browser/ui/file_dialog_gtk.cc +++ b/atom/browser/ui/file_dialog_gtk.cc @@ -4,9 +4,9 @@ #include "atom/browser/ui/file_dialog.h" +#include "atom/browser/native_window.h" #include "base/callback.h" #include "base/file_util.h" -#include "atom/browser/native_window.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/atom/browser/ui/file_dialog_mac.mm b/atom/browser/ui/file_dialog_mac.mm index 495db6849..15b39c25a 100644 --- a/atom/browser/ui/file_dialog_mac.mm +++ b/atom/browser/ui/file_dialog_mac.mm @@ -5,11 +5,11 @@ #include "atom/browser/ui/file_dialog.h" #import -#include +#import +#include "atom/browser/native_window.h" #include "base/file_util.h" #include "base/strings/sys_string_conversions.h" -#include "atom/browser/native_window.h" namespace file_dialog { diff --git a/atom/browser/ui/file_dialog_win.cc b/atom/browser/ui/file_dialog_win.cc index d813dfe9a..94c7a962a 100644 --- a/atom/browser/ui/file_dialog_win.cc +++ b/atom/browser/ui/file_dialog_win.cc @@ -9,13 +9,13 @@ #include #include +#include "atom/browser/native_window.h" #include "base/file_util.h" #include "base/i18n/case_conversion.h" #include "base/strings/string_util.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" -#include "atom/browser/native_window.h" #include "third_party/wtl/include/atlapp.h" #include "third_party/wtl/include/atldlgs.h" diff --git a/atom/browser/ui/message_box_gtk.cc b/atom/browser/ui/message_box_gtk.cc index 7e4ffe4f9..16afd6562 100644 --- a/atom/browser/ui/message_box_gtk.cc +++ b/atom/browser/ui/message_box_gtk.cc @@ -4,9 +4,9 @@ #include "atom/browser/ui/message_box.h" +#include "atom/browser/native_window.h" #include "base/callback.h" #include "base/strings/string_util.h" -#include "atom/browser/native_window.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/atom/browser/ui/message_box_mac.mm b/atom/browser/ui/message_box_mac.mm index 8e9acf960..248befc0d 100644 --- a/atom/browser/ui/message_box_mac.mm +++ b/atom/browser/ui/message_box_mac.mm @@ -6,9 +6,9 @@ #import +#include "atom/browser/native_window.h" #include "base/callback.h" #include "base/strings/sys_string_conversions.h" -#include "atom/browser/native_window.h" @interface ModalDelegate : NSObject { @private diff --git a/atom/browser/ui/message_box_win.cc b/atom/browser/ui/message_box_win.cc index 3227c8b2a..02c4997c2 100644 --- a/atom/browser/ui/message_box_win.cc +++ b/atom/browser/ui/message_box_win.cc @@ -4,12 +4,12 @@ #include "atom/browser/ui/message_box.h" +#include "atom/browser/native_window.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 "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/atom/browser/ui/win/menu_2.h b/atom/browser/ui/win/menu_2.h index a6a822aa6..7c7e7874d 100644 --- a/atom/browser/ui/win/menu_2.h +++ b/atom/browser/ui/win/menu_2.h @@ -6,9 +6,9 @@ #ifndef ATOM_BROWSER_UI_WIN_MENU_2_H_ #define ATOM_BROWSER_UI_WIN_MENU_2_H_ +#include "atom/browser/ui/win/native_menu_win.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "atom/browser/ui/win/native_menu_win.h" #include "ui/gfx/native_widget_types.h" namespace gfx { diff --git a/atom/browser/ui/win/native_menu_win.cc b/atom/browser/ui/win/native_menu_win.cc index 47555f8f3..797802b94 100644 --- a/atom/browser/ui/win/native_menu_win.cc +++ b/atom/browser/ui/win/native_menu_win.cc @@ -6,13 +6,13 @@ #include +#include "atom/browser/ui/win/menu_2.h" #include "base/bind.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/win/wrapped_window_proc.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/atom/browser/window_list.cc b/atom/browser/window_list.cc index 9343d89ac..89682aeb2 100644 --- a/atom/browser/window_list.cc +++ b/atom/browser/window_list.cc @@ -6,9 +6,9 @@ #include -#include "base/logging.h" #include "atom/browser/native_window.h" #include "atom/browser/window_list_observer.h" +#include "base/logging.h" namespace atom { diff --git a/atom/common/api/api_messages.h b/atom/common/api/api_messages.h index 003ac790f..719ed7900 100644 --- a/atom/common/api/api_messages.h +++ b/atom/common/api/api_messages.h @@ -4,9 +4,9 @@ // Multiply-included file, no traditional include guard. +#include "atom/common/draggable_region.h" #include "base/strings/string16.h" #include "base/values.h" -#include "atom/common/draggable_region.h" #include "content/public/common/common_param_traits.h" #include "ipc/ipc_message_macros.h" diff --git a/atom/common/api/atom_api_event_emitter.cc b/atom/common/api/atom_api_event_emitter.cc index c66404924..9588a3b5c 100644 --- a/atom/common/api/atom_api_event_emitter.cc +++ b/atom/common/api/atom_api_event_emitter.cc @@ -6,9 +6,9 @@ #include -#include "base/logging.h" #include "atom/browser/api/atom_api_event.h" #include "atom/common/v8/native_type_conversions.h" +#include "base/logging.h" #include "atom/common/v8/node_common.h" diff --git a/atom/common/api/atom_api_id_weak_map.cc b/atom/common/api/atom_api_id_weak_map.cc index 3a2fb2ce5..08fe741bc 100644 --- a/atom/common/api/atom_api_id_weak_map.cc +++ b/atom/common/api/atom_api_id_weak_map.cc @@ -7,9 +7,9 @@ #include -#include "base/logging.h" #include "atom/common/v8/native_type_conversions.h" #include "atom/common/v8/node_common.h" +#include "base/logging.h" namespace atom { diff --git a/atom/common/api/atom_api_id_weak_map.h b/atom/common/api/atom_api_id_weak_map.h index c4e02c2c8..3f0646f78 100644 --- a/atom/common/api/atom_api_id_weak_map.h +++ b/atom/common/api/atom_api_id_weak_map.h @@ -8,14 +8,15 @@ #include -#include "base/basictypes.h" #include "atom/common/v8/scoped_persistent.h" +#include "base/basictypes.h" #include "vendor/node/src/node_object_wrap.h" namespace atom { namespace api { +// Like ES6's WeakMap, but the key is Integer and the value is Weak Pointer. class IDWeakMap : public node::ObjectWrap { public: static void Initialize(v8::Handle target); diff --git a/atom/common/api/atom_api_shell.cc b/atom/common/api/atom_api_shell.cc index 6864e25f2..bae608982 100644 --- a/atom/common/api/atom_api_shell.cc +++ b/atom/common/api/atom_api_shell.cc @@ -6,9 +6,9 @@ #include -#include "base/files/file_path.h" #include "atom/common/platform_util.h" #include "atom/common/v8/native_type_conversions.h" +#include "base/files/file_path.h" #include "url/gurl.h" #include "atom/common/v8/node_common.h" diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc index 4f1723db5..26c5daf30 100644 --- a/atom/common/api/atom_bindings.cc +++ b/atom/common/api/atom_bindings.cc @@ -6,9 +6,9 @@ #include -#include "base/logging.h" #include "atom/common/atom_version.h" #include "atom/common/v8/native_type_conversions.h" +#include "base/logging.h" #include "atom/common/v8/node_common.h" diff --git a/atom/common/api/object_life_monitor.h b/atom/common/api/object_life_monitor.h index 101560f16..1fc285294 100644 --- a/atom/common/api/object_life_monitor.h +++ b/atom/common/api/object_life_monitor.h @@ -6,8 +6,8 @@ #ifndef ATOM_COMMON_API_OBJECT_LIFE_MONITOR_H_ #define ATOM_COMMON_API_OBJECT_LIFE_MONITOR_H_ -#include "base/basictypes.h" #include "atom/common/v8/scoped_persistent.h" +#include "base/basictypes.h" namespace atom { diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc index 02d82a4cc..23d25f37f 100644 --- a/atom/common/crash_reporter/crash_reporter.cc +++ b/atom/common/crash_reporter/crash_reporter.cc @@ -4,9 +4,9 @@ #include "atom/common/crash_reporter/crash_reporter.h" -#include "base/command_line.h" #include "atom/browser/browser.h" #include "atom/common/atom_version.h" +#include "base/command_line.h" #include "content/public/common/content_switches.h" namespace crash_reporter { diff --git a/atom/common/crash_reporter/crash_reporter_linux.h b/atom/common/crash_reporter/crash_reporter_linux.h index 9713ef243..8876ebad7 100644 --- a/atom/common/crash_reporter/crash_reporter_linux.h +++ b/atom/common/crash_reporter/crash_reporter_linux.h @@ -7,10 +7,10 @@ #include -#include "base/compiler_specific.h" -#include "base/memory/scoped_ptr.h" #include "atom/common/crash_reporter/crash_reporter.h" #include "atom/common/crash_reporter/linux/crash_dump_handler.h" +#include "base/compiler_specific.h" +#include "base/memory/scoped_ptr.h" template struct DefaultSingletonTraits; diff --git a/atom/common/crash_reporter/crash_reporter_mac.h b/atom/common/crash_reporter/crash_reporter_mac.h index 7791b7270..a24bca9b5 100644 --- a/atom/common/crash_reporter/crash_reporter_mac.h +++ b/atom/common/crash_reporter/crash_reporter_mac.h @@ -7,8 +7,8 @@ #include -#include "base/compiler_specific.h" #include "atom/common/crash_reporter/crash_reporter.h" +#include "base/compiler_specific.h" #import "vendor/breakpad/src/client/mac/Framework/Breakpad.h" template struct DefaultSingletonTraits; diff --git a/atom/common/crash_reporter/crash_reporter_win.h b/atom/common/crash_reporter/crash_reporter_win.h index f57e6aad8..8e138b070 100644 --- a/atom/common/crash_reporter/crash_reporter_win.h +++ b/atom/common/crash_reporter/crash_reporter_win.h @@ -8,9 +8,9 @@ #include #include +#include "atom/common/crash_reporter/crash_reporter.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.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/atom/common/crash_reporter/win/crash_service_main.cc b/atom/common/crash_reporter/win/crash_service_main.cc index 7cd35445d..8a587ae87 100644 --- a/atom/common/crash_reporter/win/crash_service_main.cc +++ b/atom/common/crash_reporter/win/crash_service_main.cc @@ -4,12 +4,12 @@ #include "atom/common/crash_reporter/win/crash_service_main.h" +#include "atom/common/crash_reporter/win/crash_service.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 "atom/common/crash_reporter/win/crash_service.h" namespace crash_service { diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc index b8ed993ce..8545f1fae 100644 --- a/atom/common/node_bindings.cc +++ b/atom/common/node_bindings.cc @@ -7,11 +7,11 @@ #include #include +#include "atom/common/v8/native_type_conversions.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" #include "base/base_paths.h" #include "base/path_service.h" -#include "atom/common/v8/native_type_conversions.h" #include "content/public/browser/browser_thread.h" #if defined(OS_WIN) diff --git a/atom/common/node_bindings_mac.h b/atom/common/node_bindings_mac.h index b49a4ece5..fb5e1d54e 100644 --- a/atom/common/node_bindings_mac.h +++ b/atom/common/node_bindings_mac.h @@ -5,8 +5,8 @@ #ifndef ATOM_COMMON_NODE_BINDINGS_MAC_H_ #define ATOM_COMMON_NODE_BINDINGS_MAC_H_ -#include "base/compiler_specific.h" #include "atom/common/node_bindings.h" +#include "base/compiler_specific.h" namespace atom { diff --git a/atom/common/node_bindings_win.h b/atom/common/node_bindings_win.h index 2bec6bdab..a063a37d6 100644 --- a/atom/common/node_bindings_win.h +++ b/atom/common/node_bindings_win.h @@ -5,8 +5,8 @@ #ifndef ATOM_COMMON_NODE_BINDINGS_WIN_H_ #define ATOM_COMMON_NODE_BINDINGS_WIN_H_ -#include "base/compiler_specific.h" #include "atom/common/node_bindings.h" +#include "base/compiler_specific.h" namespace atom { diff --git a/atom/common/v8/native_type_conversions.h b/atom/common/v8/native_type_conversions.h index 82861d48c..fbe615b3f 100644 --- a/atom/common/v8/native_type_conversions.h +++ b/atom/common/v8/native_type_conversions.h @@ -9,14 +9,14 @@ #include #include -#include "base/files/file_path.h" -#include "base/strings/string16.h" -#include "base/template_util.h" -#include "base/values.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 "base/files/file_path.h" +#include "base/strings/string16.h" +#include "base/template_util.h" +#include "base/values.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/atom/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc index 7f7a81b7c..734a60336 100644 --- a/atom/renderer/atom_render_view_observer.cc +++ b/atom/renderer/atom_render_view_observer.cc @@ -7,10 +7,10 @@ #include #include "atom/common/api/api_messages.h" -#include "content/public/renderer/render_view.h" -#include "ipc/ipc_message_macros.h" #include "atom/renderer/api/atom_renderer_bindings.h" #include "atom/renderer/atom_renderer_client.h" +#include "content/public/renderer/render_view.h" +#include "ipc/ipc_message_macros.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" diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc index 9851f462b..2ac028f27 100644 --- a/atom/renderer/atom_renderer_client.cc +++ b/atom/renderer/atom_renderer_client.cc @@ -7,11 +7,11 @@ #include #include -#include "base/command_line.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 "base/command_line.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebFrame.h" -- 2.34.1