Bug 1248339 - fix header sort order of hal. r=gsvelto
authorMantaroh Yoshinaga <mantaroh@gmail.com>
Mon, 15 Feb 2016 07:33:00 +0100
changeset 310568 a21fa8fc9d281bab39167038b02be11741dbe43d
parent 310567 c097541033bc152119025dfd52354983824a8c20
child 310569 5d65efb34cd5ebdde5f6ff09de25fcb4165820d0
push idunknown
push userunknown
push dateunknown
reviewersgsvelto
bugs1248339
milestone47.0a1
Bug 1248339 - fix header sort order of hal. r=gsvelto
hal/Hal.cpp
hal/Hal.h
hal/WindowIdentifier.cpp
hal/WindowIdentifier.h
--- a/hal/Hal.cpp
+++ b/hal/Hal.cpp
@@ -1,36 +1,37 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set sw=2 ts=8 et ft=cpp : */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Hal.h"
+
 #include "HalImpl.h"
 #include "HalLog.h"
 #include "HalSandbox.h"
+#include "nsIDOMDocument.h"
+#include "nsIDOMWindow.h"
+#include "nsIDocument.h"
+#include "nsIDocShell.h"
+#include "nsITabChild.h"
+#include "nsIWebNavigation.h"
 #include "nsThreadUtils.h"
 #include "nsXULAppAPI.h"
+#include "nsPIDOMWindow.h"
+#include "nsJSUtils.h"
+#include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Observer.h"
-#include "nsIDocument.h"
-#include "nsIDOMDocument.h"
-#include "nsPIDOMWindow.h"
-#include "nsIDOMWindow.h"
 #include "mozilla/Services.h"
-#include "nsIWebNavigation.h"
-#include "nsITabChild.h"
-#include "nsIDocShell.h"
 #include "mozilla/StaticPtr.h"
-#include "mozilla/ClearOnShutdown.h"
-#include "WindowIdentifier.h"
-#include "nsJSUtils.h"
-#include "mozilla/dom/ScreenOrientation.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/ScreenOrientation.h"
+#include "WindowIdentifier.h"
 
 #ifdef XP_WIN
 #include <process.h>
 #define getpid _getpid
 #endif
 
 using namespace mozilla::services;
 using namespace mozilla::dom;
--- a/hal/Hal.h
+++ b/hal/Hal.h
@@ -2,29 +2,29 @@
 /* vim: set sw=2 ts=8 et ft=cpp : */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_Hal_h
 #define mozilla_Hal_h
 
-#include "mozilla/hal_sandbox/PHal.h"
-#include "mozilla/HalTypes.h"
 #include "base/basictypes.h"
 #include "base/platform_thread.h"
-#include "mozilla/Observer.h"
-#include "mozilla/Types.h"
 #include "nsTArray.h"
+#include "mozilla/dom/battery/Types.h"
 #include "mozilla/dom/MozPowerManagerBinding.h"
-#include "mozilla/dom/battery/Types.h"
 #include "mozilla/dom/network/Types.h"
 #include "mozilla/dom/power/Types.h"
 #include "mozilla/dom/ScreenOrientation.h"
+#include "mozilla/hal_sandbox/PHal.h"
 #include "mozilla/HalScreenConfiguration.h"
+#include "mozilla/HalTypes.h"
+#include "mozilla/Observer.h"
+#include "mozilla/Types.h"
 
 /*
  * Hal.h contains the public Hal API.
  *
  * By default, this file defines its functions in the hal namespace, but if
  * MOZ_HAL_NAMESPACE is defined, we'll define our functions in that namespace.
  *
  * This is used by HalImpl.h and HalSandbox.h, which define copies of all the
--- a/hal/WindowIdentifier.cpp
+++ b/hal/WindowIdentifier.cpp
@@ -1,16 +1,17 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set sw=2 ts=8 et ft=cpp : */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "WindowIdentifier.h"
+
 #include "mozilla/dom/ContentChild.h"
-#include "WindowIdentifier.h"
 #include "nsPIDOMWindow.h"
 
 namespace mozilla {
 namespace hal {
 
 WindowIdentifier::WindowIdentifier()
   : mWindow(nullptr)
   , mIsEmpty(true)
--- a/hal/WindowIdentifier.h
+++ b/hal/WindowIdentifier.h
@@ -3,18 +3,18 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_hal_WindowIdentifier_h
 #define mozilla_hal_WindowIdentifier_h
 
 #include "mozilla/Types.h"
+#include "nsCOMPtr.h"
 #include "nsTArray.h"
-#include "nsCOMPtr.h"
 
 class nsPIDOMWindowInner;
 
 namespace mozilla {
 namespace hal {
 
 /**
  * This class serves two purposes.