Reorder the sequence of includes

diff --git a/common/app_control.cc b/common/app_control.cc
old mode 100755 (executable)
new mode 100644 (file)
index 5818b8f..8e3b753
--- a/common/app_control.cc
+++ b/common/app_control.cc
@@ -22,13 +22,13 @@
 #include <algorithm>
 #include <memory>
 #include <map>
-#include <vector>
 #include <regex> // NOLINT
 #include <utility>
+#include <vector>
 
+#include "common/file_utils.h"
 #include "common/logger.h"
 #include "common/string_utils.h"
-#include "common/file_utils.h"
 
 namespace common {
 

diff --git a/common/app_control.h b/common/app_control.h
old mode 100755 (executable)
new mode 100644 (file)
index e59de11..573d24a
--- a/common/app_control.h
+++ b/common/app_control.h
@@ -19,10 +19,10 @@
 
 #include <app_control.h>
 #include <bundle.h>
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
 namespace common {
 

diff --git a/common/app_db.cc b/common/app_db.cc
old mode 100755 (executable)
new mode 100644 (file)
index e079569..9ae065a
--- a/common/app_db.cc
+++ b/common/app_db.cc
@@ -20,16 +20,15 @@
 #ifdef USE_APP_PREFERENCE
 #include <app_preference.h>
 #else
-#include <unistd.h>
-#include <sqlite3.h>
 #include <app.h>
+#include <sqlite3.h>
+#include <unistd.h>
 #endif
 
 #include <memory>
 
-#include "common/string_utils.h"
 #include "common/logger.h"
-
+#include "common/string_utils.h"
 #ifndef USE_APP_PREFERENCE
 #include "common/app_db_sqlite.h"
 #endif

diff --git a/common/app_db.h b/common/app_db.h
old mode 100755 (executable)
new mode 100644 (file)
index df76a44..ac6fbb5
--- a/common/app_db.h
+++ b/common/app_db.h
@@ -17,8 +17,8 @@
 #ifndef XWALK_COMMON_APP_DB_H_
 #define XWALK_COMMON_APP_DB_H_
 
-#include <string>
 #include <list>
+#include <string>
 
 namespace common {
 

diff --git a/common/app_db_sqlite.h b/common/app_db_sqlite.h
old mode 100755 (executable)
new mode 100644 (file)
index 8c58cb7..8804831
--- a/common/app_db_sqlite.h
+++ b/common/app_db_sqlite.h
@@ -1,52 +1,52 @@
-/*\r
- * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved\r
- *\r
- *    Licensed under the Apache License, Version 2.0 (the "License");\r
- *    you may not use this file except in compliance with the License.\r
- *    You may obtain a copy of the License at\r
- *\r
- *        http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- *    Unless required by applicable law or agreed to in writing, software\r
- *    distributed under the License is distributed on an "AS IS" BASIS,\r
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- *    See the License for the specific language governing permissions and\r
- *    limitations under the License.\r
- */\r
-\r
-#ifndef XWALK_COMMON_APP_DB_SQLITE_H_\r
-#define XWALK_COMMON_APP_DB_SQLITE_H_\r
-\r
-#include <string>\r
-#include <list>\r
-\r
-#include "common/app_db.h"\r
-\r
-class sqlite3;\r
-\r
-namespace common {\r
-class SqliteDB : public AppDB {\r
- public:\r
-  explicit SqliteDB(const std::string& app_data_path = std::string());\r
-  ~SqliteDB();\r
-  virtual bool HasKey(const std::string& section,\r
-                      const std::string& key) const;\r
-  virtual std::string Get(const std::string& section,\r
-                          const std::string& key) const;\r
-  virtual void Set(const std::string& section,\r
-                   const std::string& key,\r
-                   const std::string& value);\r
-  virtual void GetKeys(const std::string& section,\r
-                       std::list<std::string>* keys) const;\r
-  virtual void Remove(const std::string& section,\r
-                      const std::string& key);\r
-\r
- private:\r
-  void Initialize();\r
-  std::string app_data_path_;\r
-  sqlite3* sqldb_;\r
-};\r
-\r
-}  //  namespace common\r
-\r
-#endif  // XWALK_COMMON_APP_DB_SQLITE_H_\r
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef XWALK_COMMON_APP_DB_SQLITE_H_
+#define XWALK_COMMON_APP_DB_SQLITE_H_
+
+#include <list>
+#include <string>
+
+#include "common/app_db.h"
+
+class sqlite3;
+
+namespace common {
+class SqliteDB : public AppDB {
+ public:
+  explicit SqliteDB(const std::string& app_data_path = std::string());
+  ~SqliteDB();
+  virtual bool HasKey(const std::string& section,
+                      const std::string& key) const;
+  virtual std::string Get(const std::string& section,
+                          const std::string& key) const;
+  virtual void Set(const std::string& section,
+                   const std::string& key,
+                   const std::string& value);
+  virtual void GetKeys(const std::string& section,
+                       std::list<std::string>* keys) const;
+  virtual void Remove(const std::string& section,
+                      const std::string& key);
+
+ private:
+  void Initialize();
+  std::string app_data_path_;
+  sqlite3* sqldb_;
+};
+
+}  //  namespace common
+
+#endif  // XWALK_COMMON_APP_DB_SQLITE_H_

diff --git a/common/application_data.cc b/common/application_data.cc
old mode 100755 (executable)
new mode 100644 (file)
index bcdf40b..5eae07d
--- a/common/application_data.cc
+++ b/common/application_data.cc
@@ -16,14 +16,14 @@
 
 #include "common/application_data.h"
 
-#include <package_manager.h>
-#include <manifest_handlers/widget_config_parser.h>
 #include <manifest_handlers/application_manifest_constants.h>
+#include <manifest_handlers/widget_config_parser.h>
+#include <package_manager.h>
 
 #include <vector>
 
-#include "common/logger.h"
 #include "common/file_utils.h"
+#include "common/logger.h"
 #include "common/profiler.h"
 
 namespace common {

diff --git a/common/application_data.h b/common/application_data.h
old mode 100755 (executable)
new mode 100644 (file)
index 69a8b0c..5831cf3
--- a/common/application_data.h
+++ b/common/application_data.h
@@ -21,6 +21,8 @@
 #include <manifest_handlers/appwidget_handler.h>
 #include <manifest_handlers/app_control_handler.h>
 #include <manifest_handlers/category_handler.h>
+#include <manifest_handlers/content_handler.h>
+#include <manifest_handlers/csp_handler.h>
 #include <manifest_handlers/ime_handler.h>
 #include <manifest_handlers/metadata_handler.h>
 #include <manifest_handlers/navigation_handler.h>
@@ -29,11 +31,8 @@
 #include <manifest_handlers/setting_handler.h>
 #include <manifest_handlers/splash_screen_handler.h>
 #include <manifest_handlers/tizen_application_handler.h>
-#include <manifest_handlers/widget_handler.h>
-#include <manifest_handlers/content_handler.h>
 #include <manifest_handlers/warp_handler.h>
-#include <manifest_handlers/csp_handler.h>
-
+#include <manifest_handlers/widget_handler.h>
 
 #include <memory>
 #include <string>

diff --git a/common/command_line.cc b/common/command_line.cc
index d884fdaf0da72fb13fe58cb6bedd219d598fd03c..12a366790cb6216ed660eda27b9ad3b09a7361e4 100644 (file)
--- a/common/command_line.cc
+++ b/common/command_line.cc
@@ -17,6 +17,7 @@
 #include "common/command_line.h"
 
 #include <cstring>
+
 #include "common/file_utils.h"
 
 namespace common {

diff --git a/common/command_line.h b/common/command_line.h
index d2ee84286329989a482a9618ac1c73216df4fcc6..68548086f6d806ac3d9e9364f4078402fdf5a4c1 100644 (file)
--- a/common/command_line.h
+++ b/common/command_line.h
@@ -17,8 +17,8 @@
 #ifndef XWALK_COMMON_COMMAND_LINE_H_
 #define XWALK_COMMON_COMMAND_LINE_H_
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
 namespace common {

diff --git a/common/common.gyp b/common/common.gyp
index 9c886cb13f82d2e1ad4cb47b7d037c77f2cfb9b0..9826187a78b830164e14f43878e03a79bbaa7627 100644 (file)
--- a/common/common.gyp
+++ b/common/common.gyp
@@ -40,19 +40,19 @@
       ],
       'variables': {
         'packages': [
-          'dlog',
-          'gio-2.0',
-          'uuid',
-          'aul',
           'appsvc',
-          'pkgmgr-info',
-          'manifest-parser',
-          'manifest-handlers',
-          'capi-appfw-package-manager',
+          'aul',
           'capi-appfw-application',
+          'capi-appfw-package-manager',
           'capi-system-system-settings',
+          'dlog',
+          'gio-2.0',
+          'uuid',
           'libcurl',
           'libwebappenc',
+          'manifest-parser',
+          'manifest-handlers',
+          'pkgmgr-info',
           'glib-2.0',
         ],
       },

diff --git a/common/dbus_client.cc b/common/dbus_client.cc
index 8c1831590d585e0359df0c2dddf7f2aa1ea424b5..52caa82497bdae23135132bec2a6770afcbe6dc1 100644 (file)
--- a/common/dbus_client.cc
+++ b/common/dbus_client.cc
@@ -16,8 +16,8 @@
 
 #include "common/dbus_client.h"
 
-#include "common/logger.h"
 #include "common/file_utils.h"
+#include "common/logger.h"
 
 namespace common {
 

diff --git a/common/dbus_client.h b/common/dbus_client.h
index 1f6c519a6acbc8532926a0f27d95a5e8e414c08c..0863a5cb80c5199b34dbb8ec4fde388578a19124 100644 (file)
--- a/common/dbus_client.h
+++ b/common/dbus_client.h
@@ -17,12 +17,12 @@
 #ifndef XWALK_COMMON_DBUS_CLIENT_H_
 #define XWALK_COMMON_DBUS_CLIENT_H_
 
-#include <glib.h>
 #include <gio/gio.h>
+#include <glib.h>
 
-#include <string>
 #include <functional>
 #include <map>
+#include <string>
 
 namespace common {
 

diff --git a/common/dbus_server.h b/common/dbus_server.h
index d03f813366e5197f0cb12b9ff7c46e93260c176f..112f89110c29300a7b0531751a164b549ef8b832 100644 (file)
--- a/common/dbus_server.h
+++ b/common/dbus_server.h
@@ -17,11 +17,11 @@
 #ifndef XWALK_COMMON_DBUS_SERVER_H_
 #define XWALK_COMMON_DBUS_SERVER_H_
 
-#include <glib.h>
 #include <gio/gio.h>
-#include <string>
-#include <map>
+#include <glib.h>
 #include <functional>
+#include <map>
+#include <string>
 
 namespace common {
 

diff --git a/common/file_utils.cc b/common/file_utils.cc
index 47eb222a976e3e0476504f9c17801a1c662d76f0..2b00d3c1568bbef2041e4e2777aee72fecb87aa0 100644 (file)
--- a/common/file_utils.cc
+++ b/common/file_utils.cc
@@ -16,13 +16,13 @@
 
 #include "common/file_utils.h"
 
-#include <unistd.h>
-#include <libgen.h>
 #include <sys/types.h>
+#include <libgen.h>
+#include <unistd.h>
 
-#include <string>
-#include <sstream>
 #include <algorithm>
+#include <sstream>
+#include <string>
 
 namespace common {
 namespace utils {

diff --git a/common/locale_manager.cc b/common/locale_manager.cc
old mode 100755 (executable)
new mode 100644 (file)
index e9b0866..f46a108
--- a/common/locale_manager.cc
+++ b/common/locale_manager.cc
@@ -17,11 +17,12 @@
 #include "common/locale_manager.h"
 
 #include <system_settings.h>
-#include <memory>
+
 #include <algorithm>
+#include <memory>
 
-#include "common/logger.h"
 #include "common/file_utils.h"
+#include "common/logger.h"
 
 namespace common {
 

diff --git a/common/locale_manager.h b/common/locale_manager.h
old mode 100755 (executable)
new mode 100644 (file)
index ca78110..e97d96d
--- a/common/locale_manager.h
+++ b/common/locale_manager.h
@@ -17,9 +17,9 @@
 #ifndef XWALK_COMMON_LOCALE_MANAGER_H_
 #define XWALK_COMMON_LOCALE_MANAGER_H_
 
-#include <string>
 #include <list>
 #include <map>
+#include <string>
 
 namespace common {
 

diff --git a/common/profiler.h b/common/profiler.h
index 6127c7daaf69bc023a19fc86344175e0be8c9e89..51dd90876c1446f32615aa1e563ef782b58a53b7 100644 (file)
--- a/common/profiler.h
+++ b/common/profiler.h
@@ -19,9 +19,9 @@
 
 #include <time.h>
 
-#include <string>
-#include <memory>
 #include <map>
+#include <memory>
+#include <string>
 
 namespace common {
 

diff --git a/common/resource_manager.h b/common/resource_manager.h
index da030f9ca6c49f06d4aca037b1a52d99af2d8cf9..d4e8d1243e9b025713e4154f0f549c7762f9106d 100644 (file)
--- a/common/resource_manager.h
+++ b/common/resource_manager.h
@@ -17,9 +17,9 @@
 #ifndef XWALK_COMMON_RESOURCE_MANAGER_H_
 #define XWALK_COMMON_RESOURCE_MANAGER_H_
 
-#include <string>
 #include <map>
 #include <memory>
+#include <string>
 
 namespace wgt {
 namespace parse {

diff --git a/common/string_utils.h b/common/string_utils.h
index 0d76cb767de38b82f72ad50e3732d60cf5eefd16..fbb312f4433feed4b41576428bcf30df94488e7a 100644 (file)
--- a/common/string_utils.h
+++ b/common/string_utils.h
@@ -17,8 +17,8 @@
 #ifndef XWALK_COMMON_STRING_UTILS_H_
 #define XWALK_COMMON_STRING_UTILS_H_
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace common {
 namespace utils {

diff --git a/common/url.cc b/common/url.cc
index 961b355aca3c4c86c913cfeab9c64cab61630d78..adfbff199419aa79ccf3aac2ad4a078978d68c89 100644 (file)
--- a/common/url.cc
+++ b/common/url.cc
@@ -14,11 +14,11 @@
  *    limitations under the License.
  */
 
+#include "common/url.h"
+
 #include <algorithm>
 #include <stdexcept>
 
-#include "common/url.h"
-
 #include "common/logger.h"
 #include "common/string_utils.h"
 

diff --git a/extensions/extension/xwalk_extension.cc b/extensions/extension/xwalk_extension.cc
index 492c0ed824be521e0ae556247eac50282dda4c75..43c2279ed173364f82ebf56c17384b82ec9951b4 100644 (file)
--- a/extensions/extension/xwalk_extension.cc
+++ b/extensions/extension/xwalk_extension.cc
@@ -9,8 +9,8 @@
 #include <string>
 
 #include "common/logger.h"
-#include "extensions/public/XW_Extension.h"
 #include "extensions/extension/xwalk_extension_adapter.h"
+#include "extensions/public/XW_Extension.h"
 
 namespace extensions {
 

diff --git a/extensions/extension/xwalk_extension_adapter.h b/extensions/extension/xwalk_extension_adapter.h
index 5adb942b853463d71e10cb5d1ccaa5ed34de72c9..776d003e7bb6f2d1e495a54118dd6e44f497a7d3 100644 (file)
--- a/extensions/extension/xwalk_extension_adapter.h
+++ b/extensions/extension/xwalk_extension_adapter.h
@@ -10,12 +10,11 @@
 
 #include "extensions/extension/xwalk_extension.h"
 #include "extensions/extension/xwalk_extension_instance.h"
-
 #include "extensions/public/XW_Extension.h"
-#include "extensions/public/XW_Extension_SyncMessage.h"
 #include "extensions/public/XW_Extension_EntryPoints.h"
-#include "extensions/public/XW_Extension_Runtime.h"
 #include "extensions/public/XW_Extension_Permissions.h"
+#include "extensions/public/XW_Extension_Runtime.h"
+#include "extensions/public/XW_Extension_SyncMessage.h"
 
 namespace extensions {
 

diff --git a/extensions/extension/xwalk_extension_instance.h b/extensions/extension/xwalk_extension_instance.h
index 0818f657d13ba71cfeb18b29b73c750f8f889218..9efe2db0275d031264680455c76a8f5263405cd8 100644 (file)
--- a/extensions/extension/xwalk_extension_instance.h
+++ b/extensions/extension/xwalk_extension_instance.h
@@ -6,8 +6,8 @@
 #ifndef XWALK_EXTENSIONS_XWALK_EXTENSION_INSTANCE_H_
 #define XWALK_EXTENSIONS_XWALK_EXTENSION_INSTANCE_H_
 
-#include <string>
 #include <functional>
+#include <string>
 
 #include "extensions/public/XW_Extension.h"
 

diff --git a/extensions/extension/xwalk_extension_process.cc b/extensions/extension/xwalk_extension_process.cc
index 7bbfd887ba9fda981d315e8003c0b216004c90bb..867ec5533d84c94d6a5d5119a369ab413feca6ef 100644 (file)
--- a/extensions/extension/xwalk_extension_process.cc
+++ b/extensions/extension/xwalk_extension_process.cc
@@ -6,8 +6,8 @@
 #include <glib.h>
 #include <glib-unix.h>
 
-#include "common/logger.h"
 #include "common/command_line.h"
+#include "common/logger.h"
 #include "extensions/extension/xwalk_extension_server.h"
 
 int main(int argc, char* argv[]) {

diff --git a/extensions/extension/xwalk_extension_server.cc b/extensions/extension/xwalk_extension_server.cc
index 2596d520ee8684d3273f036f34f94d5664e22b3d..075110d7f6194c74d03bd1d9f4001e20ea0a140e 100644 (file)
--- a/extensions/extension/xwalk_extension_server.cc
+++ b/extensions/extension/xwalk_extension_server.cc
@@ -4,18 +4,19 @@
 
 #include "extensions/extension/xwalk_extension_server.h"
 
-#include <glob.h>
 #include <glib.h>
+#include <glob.h>
 
+#include <fstream>
 #include <string>
 #include <vector>
-#include <fstream>
 
-#include "common/logger.h"
+#include "common/app_db.h"
 #include "common/file_utils.h"
-#include "common/string_utils.h"
+#include "common/logger.h"
 #include "common/picojson.h"
-#include "common/app_db.h"
+#include "common/string_utils.h"
+
 #include "extensions/common/constants.h"
 #include "extensions/extension/xwalk_extension.h"
 

diff --git a/extensions/extension/xwalk_extension_server.h b/extensions/extension/xwalk_extension_server.h
index 967f6d0aa44c8cdfb5994737e8d1ded9a6fcfcf4..854e534a37e7f38c128f992023155c9e25e4dc97 100644 (file)
--- a/extensions/extension/xwalk_extension_server.h
+++ b/extensions/extension/xwalk_extension_server.h
@@ -5,13 +5,13 @@
 #ifndef XWALK_EXTENSIONS_XWALK_EXTENSION_SERVER_H_
 #define XWALK_EXTENSIONS_XWALK_EXTENSION_SERVER_H_
 
-#include <string>
-#include <set>
 #include <map>
+#include <set>
+#include <string>
 #include <vector>
 
-#include "common/dbus_server.h"
 #include "common/dbus_client.h"
+#include "common/dbus_server.h"
 #include "extensions/extension/xwalk_extension.h"
 
 namespace extensions {

diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 4ef53a267acc4124b0718e16154d379a99bba38d..e864427fe1bf7b7b6fb6737f4678f53aeb5c96b8 100644 (file)
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -59,8 +59,8 @@
       ],
       'variables': {
         'packages': [
-          'elementary',
           'chromium-efl',
+          'elementary',
         ],
       },
     }, # end of target 'xwalk_extension_renderer'

diff --git a/extensions/internal/widget/widget_extension.cc b/extensions/internal/widget/widget_extension.cc
index 05ca1f98098459b91a7d1e07b346150976544aec..aab1dab80675fdf133b201dd0d4b2c19dbd727ef 100644 (file)
--- a/extensions/internal/widget/widget_extension.cc
+++ b/extensions/internal/widget/widget_extension.cc
@@ -25,9 +25,9 @@
 #include "extensions/public/XW_Extension_Runtime.h"
 #include "extensions/public/XW_Extension_SyncMessage.h"
 
-#include "common/logger.h"
 #include "common/application_data.h"
 #include "common/locale_manager.h"
+#include "common/logger.h"
 #include "common/string_utils.h"
 
 XW_Extension g_xw_extension = 0;

diff --git a/extensions/renderer/object_tools_module.cc b/extensions/renderer/object_tools_module.cc
index 8cd664f2f4726c8803684181220f699be832008f..67cb5033a6feb646d0b62f11136fd647988942ca 100644 (file)
--- a/extensions/renderer/object_tools_module.cc
+++ b/extensions/renderer/object_tools_module.cc
@@ -17,6 +17,7 @@
 #include "extensions/renderer/object_tools_module.h"
 
 #include <v8/v8.h>
+
 #include <string>
 
 #include "common/logger.h"

diff --git a/extensions/renderer/runtime_ipc_client.h b/extensions/renderer/runtime_ipc_client.h
index c1a8144d95426e2be8425d499b0705781354f7ee..d04575b6bbbc2bda36a129e9554336b8a19c08e1 100644 (file)
--- a/extensions/renderer/runtime_ipc_client.h
+++ b/extensions/renderer/runtime_ipc_client.h
@@ -19,6 +19,7 @@
 
 #include <v8/v8.h>
 #include <ewk_ipc_message.h>
+
 #include <functional>
 #include <map>
 #include <string>

diff --git a/extensions/renderer/widget_module.cc b/extensions/renderer/widget_module.cc
index 3bbf7e785b74ee77ce867303987cc88ff35ea4be..51b4c02b3eabc38f4c0f1815c4a01f2fb94228df 100644 (file)
--- a/extensions/renderer/widget_module.cc
+++ b/extensions/renderer/widget_module.cc
@@ -17,11 +17,12 @@
 #include "extensions/renderer/widget_module.h"
 
 #include <v8/v8.h>
-#include <vector>
+
 #include <algorithm>
+#include <vector>
 
-#include "common/logger.h"
 #include "common/app_db.h"
+#include "common/logger.h"
 
 namespace extensions {
 

diff --git a/extensions/renderer/xwalk_extension_client.cc b/extensions/renderer/xwalk_extension_client.cc
index 6b0885c4570a3526b45d841a8438380121187c74..f14e38d66eee111305d6863f09f33d29bcca8aa1 100644 (file)
--- a/extensions/renderer/xwalk_extension_client.cc
+++ b/extensions/renderer/xwalk_extension_client.cc
@@ -5,14 +5,14 @@
 
 #include "extensions/renderer/xwalk_extension_client.h"
 
-#include <unistd.h>
-#include <glib.h>
 #include <gio/gio.h>
+#include <glib.h>
+#include <unistd.h>
+
 #include <string>
 
 #include "common/logger.h"
 #include "common/profiler.h"
-
 #include "extensions/common/constants.h"
 
 namespace extensions {

diff --git a/extensions/renderer/xwalk_extension_client.h b/extensions/renderer/xwalk_extension_client.h
index 04343b182ddd5448baea0f564478d432526a0619..bba39eff702c7d019edab12fbe3f170b478161e2 100644 (file)
--- a/extensions/renderer/xwalk_extension_client.h
+++ b/extensions/renderer/xwalk_extension_client.h
@@ -6,9 +6,9 @@
 #ifndef XWALK_EXTENSIONS_RENDERER_XWALK_EXTENSION_CLIENT_H_
 #define XWALK_EXTENSIONS_RENDERER_XWALK_EXTENSION_CLIENT_H_
 
-#include <string>
-#include <memory>
 #include <map>
+#include <memory>
+#include <string>
 #include <vector>
 
 #include "common/dbus_client.h"

diff --git a/extensions/renderer/xwalk_extension_module.cc b/extensions/renderer/xwalk_extension_module.cc
index a720a4c0df60bff9e2d068fde7709d0c1f940756..e7d6f3c3284173fc169e10007589648a5afdda7c 100644 (file)
--- a/extensions/renderer/xwalk_extension_module.cc
+++ b/extensions/renderer/xwalk_extension_module.cc
@@ -6,16 +6,16 @@
 
 #include "extensions/renderer/xwalk_extension_module.h"
 
-#include <stdio.h>
-#include <stdarg.h>
 #include <v8/v8.h>
+#include <stdarg.h>
+#include <stdio.h>
 
 #include <vector>
 
 #include "common/logger.h"
+#include "extensions/renderer/runtime_ipc_client.h"
 #include "extensions/renderer/xwalk_extension_client.h"
 #include "extensions/renderer/xwalk_module_system.h"
-#include "extensions/renderer/runtime_ipc_client.h"
 
 // The arraysize(arr) macro returns the # of elements in an array arr.
 // The expression is a compile-time constant, and therefore can be

diff --git a/extensions/renderer/xwalk_extension_renderer_controller.cc b/extensions/renderer/xwalk_extension_renderer_controller.cc
index 294388a8df321a65a47cdd80a453a68304c47e07..1e6395d1ba903249ddc2411404919ae2cae6240c 100644 (file)
--- a/extensions/renderer/xwalk_extension_renderer_controller.cc
+++ b/extensions/renderer/xwalk_extension_renderer_controller.cc
@@ -11,12 +11,12 @@
 
 #include "common/logger.h"
 #include "common/profiler.h"
+#include "extensions/renderer/object_tools_module.h"
+#include "extensions/renderer/widget_module.h"
 #include "extensions/renderer/xwalk_extension_client.h"
 #include "extensions/renderer/xwalk_extension_module.h"
 #include "extensions/renderer/xwalk_module_system.h"
 #include "extensions/renderer/xwalk_v8tools_module.h"
-#include "extensions/renderer/widget_module.h"
-#include "extensions/renderer/object_tools_module.h"
 
 namespace extensions {
 

diff --git a/extensions/renderer/xwalk_extension_renderer_controller.h b/extensions/renderer/xwalk_extension_renderer_controller.h
index f271d2f7a397f534d94dee84cde116515ddcf6eb..c8937e79c4285bebdba747461d48b0f3c1352c02 100644 (file)
--- a/extensions/renderer/xwalk_extension_renderer_controller.h
+++ b/extensions/renderer/xwalk_extension_renderer_controller.h
@@ -7,8 +7,8 @@
 #define XWALK_EXTENSIONS_RENDERER_XWALK_EXTENSION_RENDERER_CONTROLLER_H_
 
 #include <v8/v8.h>
-#include <string>
 #include <memory>
+#include <string>
 
 namespace extensions {
 

diff --git a/extensions/renderer/xwalk_module_system.cc b/extensions/renderer/xwalk_module_system.cc
index 11ccf299c1ec761c6a4ed4f71204bb4cc393a52b..f7998090f23685f05b6a1659688574ea99a02912 100644 (file)
--- a/extensions/renderer/xwalk_module_system.cc
+++ b/extensions/renderer/xwalk_module_system.cc
@@ -6,6 +6,7 @@
 #include "extensions/renderer/xwalk_module_system.h"
 
 #include <v8/v8.h>
+
 #include <algorithm>
 
 #include "common/logger.h"

diff --git a/extensions/renderer/xwalk_module_system.h b/extensions/renderer/xwalk_module_system.h
index 89aef424da67812ff4f416d9b0cffcdba98e22bb..b70603a49c254c46992952c4c351415b8379c07c 100644 (file)
--- a/extensions/renderer/xwalk_module_system.h
+++ b/extensions/renderer/xwalk_module_system.h
@@ -7,10 +7,11 @@
 #define XWALK_EXTENSIONS_RENDERER_XWALK_MODULE_SYSTEM_H_
 
 #include <v8/v8.h>
-#include <vector>
-#include <string>
-#include <memory>
+
 #include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace extensions {
 

diff --git a/packaging/crosswalk-tizen.spec b/packaging/crosswalk-tizen.spec
index 291049f5878701953b792b6865125640d0ebe068..1c587388e7581db0db73551705ebab58df982979 100644 (file)
--- a/packaging/crosswalk-tizen.spec
+++ b/packaging/crosswalk-tizen.spec
@@ -22,34 +22,34 @@ ExclusiveArch:
 %endif
 ############################################################
 
-BuildRequires: ninja
+BuildRequires: boost-devel
 BuildRequires: edje-tools
 BuildRequires: gettext
+BuildRequires: ninja
 BuildRequires: python
-BuildRequires: boost-devel
 BuildRequires: pkgconfig(appsvc)
+BuildRequires: pkgconfig(aul)
 BuildRequires: pkgconfig(bundle)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(capi-appfw-application)
-BuildRequires: pkgconfig(manifest-parser)
-BuildRequires: pkgconfig(manifest-handlers)
-BuildRequires: pkgconfig(pkgmgr-info)
 BuildRequires: pkgconfig(capi-appfw-package-manager)
-BuildRequires: pkgconfig(efl-extension)
-BuildRequires: pkgconfig(deviced)
 BuildRequires: pkgconfig(capi-system-system-settings)
-BuildRequires: pkgconfig(uuid)
-BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(aul)
+BuildRequires: pkgconfig(chromium-efl)
+BuildRequires: pkgconfig(deviced)
+BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(ecore)
-BuildRequires: pkgconfig(notification)
-BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(ecore-wayland)
-BuildRequires: pkgconfig(chromium-efl)
+BuildRequires: pkgconfig(efl-extension)
+BuildRequires: pkgconfig(elementary)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(libcurl)
 BuildRequires: pkgconfig(libwebappenc)
-BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(manifest-handlers)
+BuildRequires: pkgconfig(manifest-parser)
+BuildRequires: pkgconfig(notification)
+BuildRequires: pkgconfig(pkgmgr-info)
+BuildRequires: pkgconfig(sqlite3)
+BuildRequires: pkgconfig(uuid)
 
 %description
 Crosswalk Runtime and AppShell for Tizen 3.0 and later

diff --git a/runtime/browser/native_window.h b/runtime/browser/native_window.h
old mode 100755 (executable)
new mode 100644 (file)
index 247c595..131c6ba
--- a/runtime/browser/native_window.h
+++ b/runtime/browser/native_window.h
@@ -16,11 +16,12 @@
 
 #ifndef XWALK_RUNTIME_BROWSER_NATIVE_WINDOW_H_
 #define XWALK_RUNTIME_BROWSER_NATIVE_WINDOW_H_
-#include <functional>
-#include <map>
 
 #include <Elementary.h>
 
+#include <functional>
+#include <map>
+
 namespace runtime {
 
 class NativeWindow {

diff --git a/runtime/browser/notification_manager.h b/runtime/browser/notification_manager.h
old mode 100755 (executable)
new mode 100644 (file)
index 27c99cc..da93524
--- a/runtime/browser/notification_manager.h
+++ b/runtime/browser/notification_manager.h
@@ -18,8 +18,8 @@
 #ifndef XWALK_RUNTIME_BROWSER_NOTIFICATION_MANAGER_H_
 #define XWALK_RUNTIME_BROWSER_NOTIFICATION_MANAGER_H_
 
-#include <string>
 #include <map>
+#include <string>
 
 namespace runtime {
 class NotificationManager {

diff --git a/runtime/browser/popup.cc b/runtime/browser/popup.cc
old mode 100755 (executable)
new mode 100644 (file)
index dcd5557..82a2d87
--- a/runtime/browser/popup.cc
+++ b/runtime/browser/popup.cc
@@ -18,10 +18,9 @@
 #include "runtime/browser/popup.h"
 
 #include "common/logger.h"
-
-#include "runtime/common/constants.h"
 #include "runtime/browser/native_window.h"
 #include "runtime/browser/popup_string.h"
+#include "runtime/common/constants.h"
 
 namespace runtime {
 

diff --git a/runtime/browser/popup.h b/runtime/browser/popup.h
old mode 100755 (executable)
new mode 100644 (file)
index 6e2801d..c1af8dd
--- a/runtime/browser/popup.h
+++ b/runtime/browser/popup.h
@@ -18,13 +18,13 @@
 #ifndef XWALK_RUNTIME_BROWSER_POPUP_H_
 #define XWALK_RUNTIME_BROWSER_POPUP_H_
 
-#include <Evas.h>
 #include <Elementary.h>
+#include <Evas.h>
 
-#include <string>
+#include <functional>
 #include <set>
+#include <string>
 #include <vector>
-#include <functional>
 
 namespace runtime {
 

diff --git a/runtime/browser/runtime.cc b/runtime/browser/runtime.cc
old mode 100755 (executable)
new mode 100644 (file)
index 1982caf..1701b63
--- a/runtime/browser/runtime.cc
+++ b/runtime/browser/runtime.cc
@@ -14,21 +14,20 @@
  *    limitations under the License.
  */
 
-
 #include "runtime/browser/runtime.h"
 
 #include <ewk_chromium.h>
-#include <string>
 #include <memory>
+#include <string>
 
-#include "common/logger.h"
-#include "common/command_line.h"
-#include "common/app_control.h"
 #include "common/application_data.h"
+#include "common/app_control.h"
 #include "common/app_db.h"
+#include "common/command_line.h"
+#include "common/logger.h"
 #include "common/profiler.h"
-#include "runtime/common/constants.h"
 #include "runtime/browser/native_app_window.h"
+#include "runtime/common/constants.h"
 
 namespace runtime {
 

diff --git a/runtime/browser/runtime.h b/runtime/browser/runtime.h
old mode 100755 (executable)
new mode 100644 (file)
index 00c611a..9be8495
--- a/runtime/browser/runtime.h
+++ b/runtime/browser/runtime.h
@@ -14,7 +14,6 @@
  *    limitations under the License.
  */
 
-
 #ifndef XWALK_RUNTIME_BROWSER_RUNTIME_H_
 #define XWALK_RUNTIME_BROWSER_RUNTIME_H_
 

diff --git a/runtime/browser/runtime_process.cc b/runtime/browser/runtime_process.cc
index 75aab7af99d40539b5b3f896f8a483be6963c114..815cd6dce1012155455a67f5d408257f9480a7ee 100644 (file)
--- a/runtime/browser/runtime_process.cc
+++ b/runtime/browser/runtime_process.cc
@@ -16,8 +16,8 @@
 
 #include <ewk_chromium.h>
 
-#include "common/logger.h"
 #include "common/command_line.h"
+#include "common/logger.h"
 #include "common/profiler.h"
 #include "runtime/browser/runtime.h"
 

diff --git a/runtime/browser/web_application.cc b/runtime/browser/web_application.cc
old mode 100755 (executable)
new mode 100644 (file)
index 446ec8d..ff585a9
--- a/runtime/browser/web_application.cc
+++ b/runtime/browser/web_application.cc
@@ -19,28 +19,28 @@
 #include <app.h>
 #include <Ecore.h>
 #include <ewk_chromium.h>
+
 #include <algorithm>
+#include <map>
 #include <memory>
 #include <sstream>
 #include <vector>
-#include <map>
 
-#include "common/logger.h"
-#include "common/command_line.h"
-#include "common/string_utils.h"
-#include "common/app_control.h"
-#include "common/locale_manager.h"
 #include "common/application_data.h"
-#include "common/resource_manager.h"
 #include "common/app_db.h"
+#include "common/app_control.h"
+#include "common/command_line.h"
+#include "common/locale_manager.h"
+#include "common/logger.h"
 #include "common/profiler.h"
-
+#include "common/resource_manager.h"
+#include "common/string_utils.h"
 #include "runtime/browser/native_window.h"
-#include "runtime/browser/web_view.h"
-#include "runtime/browser/vibration_manager.h"
 #include "runtime/browser/notification_manager.h"
 #include "runtime/browser/popup.h"
 #include "runtime/browser/popup_string.h"
+#include "runtime/browser/vibration_manager.h"
+#include "runtime/browser/web_view.h"
 
 #ifndef INJECTED_BUNDLE_PATH
   #error INJECTED_BUNDLE_PATH is not set.

diff --git a/runtime/browser/web_application.h b/runtime/browser/web_application.h
old mode 100755 (executable)
new mode 100644 (file)
index a5404d5..430213d
--- a/runtime/browser/web_application.h
+++ b/runtime/browser/web_application.h
@@ -17,10 +17,10 @@
 #ifndef XWALK_RUNTIME_BROWSER_WEB_APPLICATION_H_
 #define XWALK_RUNTIME_BROWSER_WEB_APPLICATION_H_
 
-#include <string>
+#include <functional>
 #include <list>
 #include <memory>
-#include <functional>
+#include <string>
 
 #include "runtime/browser/web_view.h"
 

diff --git a/runtime/browser/web_view.h b/runtime/browser/web_view.h
old mode 100755 (executable)
new mode 100644 (file)
index 718b899..8bb1823
--- a/runtime/browser/web_view.h
+++ b/runtime/browser/web_view.h
@@ -19,8 +19,8 @@
 
 #include <Elementary.h>
 #include <ewk_ipc_message.h>
-#include <string>
 #include <functional>
+#include <string>
 
 #include "runtime/browser/native_window.h"
 

diff --git a/runtime/browser/web_view_impl.cc b/runtime/browser/web_view_impl.cc
old mode 100755 (executable)
new mode 100644 (file)
index 204de32..f2d7958
--- a/runtime/browser/web_view_impl.cc
+++ b/runtime/browser/web_view_impl.cc
@@ -21,8 +21,8 @@
 #include <functional>
 #include <sstream>
 
-#include "common/logger.h"
 #include "common/file_utils.h"
+#include "common/logger.h"
 #include "common/profiler.h"
 #include "runtime/browser/native_window.h"
 

diff --git a/runtime/browser/web_view_impl.h b/runtime/browser/web_view_impl.h
old mode 100755 (executable)
new mode 100644 (file)
index 2a81112..af51350
--- a/runtime/browser/web_view_impl.h
+++ b/runtime/browser/web_view_impl.h
@@ -17,11 +17,12 @@
 #ifndef XWALK_RUNTIME_BROWSER_WEB_VIEW_IMPL_H_
 #define XWALK_RUNTIME_BROWSER_WEB_VIEW_IMPL_H_
 
-#include <ewk_chromium.h>
-#include <Elementary.h>
 #include <efl_extension.h>
-#include <string>
+#include <Elementary.h>
+#include <ewk_chromium.h>
+
 #include <map>
+#include <string>
 
 #include "common/url.h"
 #include "runtime/browser/web_view.h"

diff --git a/runtime/renderer/injected_bundle.cc b/runtime/renderer/injected_bundle.cc
index c628d0536cd4b50ab9bef49b0f5c464672158780..4f9cb4c5510b3d6eeb4e1137debd59ac2934b300 100644 (file)
--- a/runtime/renderer/injected_bundle.cc
+++ b/runtime/renderer/injected_bundle.cc
@@ -14,23 +14,24 @@
  *    limitations under the License.
  */
 
+#include <Ecore.h>
+#include <ewk_ipc_message.h>
 #include <unistd.h>
 #include <v8.h>
-#include <ewk_ipc_message.h>
-#include <Ecore.h>
-#include <string>
+
 #include <memory>
+#include <string>
 
-#include "common/logger.h"
-#include "common/string_utils.h"
 #include "common/application_data.h"
-#include "common/resource_manager.h"
 #include "common/locale_manager.h"
+#include "common/logger.h"
 #include "common/profiler.h"
+#include "common/resource_manager.h"
+#include "common/string_utils.h"
 #include "extensions/renderer/runtime_ipc_client.h"
+#include "extensions/renderer/widget_module.h"
 #include "extensions/renderer/xwalk_extension_renderer_controller.h"
 #include "extensions/renderer/xwalk_module_system.h"
-#include "extensions/renderer/widget_module.h"
 
 namespace runtime {
 class BundleGlobalData {

diff --git a/runtime/runtime.gyp b/runtime/runtime.gyp
index a8a8afac36c283d8836cbf5eb55ef7e990d8d7b0..b1edcd8c90766a721b841067cf121d0dd9919942 100644 (file)
--- a/runtime/runtime.gyp
+++ b/runtime/runtime.gyp
@@ -40,12 +40,12 @@
       ],
       'variables': {
         'packages': [
+          'capi-appfw-application',
+          'chromium-efl',
           'ecore',
           'ecore-wayland',
-          'elementary',
           'efl-extension',
-          'chromium-efl',
-          'capi-appfw-application',
+          'elementary',
           'deviced',
           'notification',
         ],
@@ -66,10 +66,10 @@
       ],
       'variables': {
         'packages': [
-          'elementary',
           'chromium-efl',
+          'elementary',
         ],
       },
     }, # end of target 'xwalk_injected_bundle'
   ],
-}
\ No newline at end of file
+}