Browse Source

Order header files.

Cheng Zhao 11 years ago
parent
commit
b6ac06c022

+ 1 - 1
atom/browser/net/atom_url_request_context_getter.cc

@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
+#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"

+ 2 - 0
atom/browser/resources/mac/Info.plist

@@ -16,5 +16,7 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>AtomApplication</string>
+  <key>NSSupportsAutomaticGraphicsSwitching</key>
+  <true/>
 </dict>
 </plist>

+ 1 - 1
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"
 

+ 2 - 2
atom/browser/ui/file_dialog_mac.mm

@@ -5,11 +5,11 @@
 #include "atom/browser/ui/file_dialog.h"
 
 #import <Cocoa/Cocoa.h>
-#include <CoreServices/CoreServices.h>
+#import <CoreServices/CoreServices.h>
 
+#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 {
 

+ 1 - 1
atom/browser/ui/file_dialog_win.cc

@@ -9,13 +9,13 @@
 #include <commdlg.h>
 #include <shlobj.h>
 
+#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"
 

+ 1 - 1
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"
 

+ 1 - 1
atom/browser/ui/message_box_mac.mm

@@ -6,9 +6,9 @@
 
 #import <Cocoa/Cocoa.h>
 
+#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

+ 1 - 1
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"

+ 1 - 1
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 {

+ 1 - 1
atom/browser/ui/win/native_menu_win.cc

@@ -6,13 +6,13 @@
 
 #include <Windowsx.h>
 
+#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"

+ 1 - 1
atom/browser/window_list.cc

@@ -6,9 +6,9 @@
 
 #include <algorithm>
 
-#include "base/logging.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/window_list_observer.h"
+#include "base/logging.h"
 
 namespace atom {
 

+ 1 - 1
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"
 

+ 1 - 1
atom/common/api/atom_api_event_emitter.cc

@@ -6,9 +6,9 @@
 
 #include <vector>
 
-#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"
 

+ 1 - 1
atom/common/api/atom_api_id_weak_map.cc

@@ -7,9 +7,9 @@
 
 #include <algorithm>
 
-#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 {
 

+ 2 - 1
atom/common/api/atom_api_id_weak_map.h

@@ -8,14 +8,15 @@
 
 #include <map>
 
-#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<v8::Object> target);

+ 1 - 1
atom/common/api/atom_api_shell.cc

@@ -6,9 +6,9 @@
 
 #include <string>
 
-#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"

+ 1 - 1
atom/common/api/atom_bindings.cc

@@ -6,9 +6,9 @@
 
 #include <string>
 
-#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"
 

+ 1 - 1
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 {
 

+ 1 - 1
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 {

+ 2 - 2
atom/common/crash_reporter/crash_reporter_linux.h

@@ -7,10 +7,10 @@
 
 #include <string>
 
-#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 <typename T> struct DefaultSingletonTraits;
 

+ 1 - 1
atom/common/crash_reporter/crash_reporter_mac.h

@@ -7,8 +7,8 @@
 
 #include <string>
 
-#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 <typename T> struct DefaultSingletonTraits;

+ 1 - 1
atom/common/crash_reporter/crash_reporter_win.h

@@ -8,9 +8,9 @@
 #include <string>
 #include <vector>
 
+#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 <typename T> struct DefaultSingletonTraits;

+ 1 - 1
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 {
 

+ 1 - 1
atom/common/node_bindings.cc

@@ -7,11 +7,11 @@
 #include <string>
 #include <vector>
 
+#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)

+ 1 - 1
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 {
 

+ 1 - 1
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 {
 

+ 4 - 4
atom/common/v8/native_type_conversions.h

@@ -9,14 +9,14 @@
 #include <string>
 #include <vector>
 
-#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"

+ 2 - 2
atom/renderer/atom_render_view_observer.cc

@@ -7,10 +7,10 @@
 #include <vector>
 
 #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"

+ 1 - 1
atom/renderer/atom_renderer_client.cc

@@ -7,11 +7,11 @@
 #include <algorithm>
 #include <string>
 
-#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"