From: Ryszard Matuszyk Date: Tue, 17 Feb 2015 08:19:22 +0000 (+0100) Subject: [Webseting] Google code style X-Git-Tag: submit/tizen_tv/20150603.064601~1^2~408 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0438f6a7302ce18c7a562bbc3ce8b4b269f4f7f6;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Webseting] Google code style [Verification] Related TCT should pass Change-Id: Icb91aea9a256a84493c2e1bc5c8639b9657d263e Signed-off-by: Ryszard Matuszyk --- diff --git a/src/websetting/websetting.cc b/src/websetting/websetting.cc index f51dbcb0..2b3ccdc6 100644 --- a/src/websetting/websetting.cc +++ b/src/websetting/websetting.cc @@ -17,14 +17,17 @@ namespace { const char kRuntimeServiceName[] = "org.crosswalkproject.Runtime1"; const char kRuntimeRunningManagerPath[] = "/running1"; -const char kRuntimeRunningAppInterface[] = "org.crosswalkproject.Running.Application1"; +const char kRuntimeRunningAppInterface[] = + "org.crosswalkproject.Running.Application1"; // The runtime process exports object for each running app on the session bus. GDBusProxy* CreateRunningAppProxy(const std::string& app_id) { GError* error = NULL; - GDBusConnection* connection = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error); + GDBusConnection* connection = + g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error); if (!connection) { - std::cerr << "Couldn't get the session bus connection: " << error->message << std::endl; + std::cerr << "Couldn't get the session bus connection: " << error->message + << std::endl; g_error_free(error); return NULL; } @@ -35,12 +38,12 @@ GDBusProxy* CreateRunningAppProxy(const std::string& app_id) { // The d-bus proxy doesn't accept '.' character in object path // And that is why the substantiation is needed here. std::replace(path.begin(), path.end(), '.', '_'); - GDBusProxy* proxy = - g_dbus_proxy_new_sync(connection, G_DBUS_PROXY_FLAGS_NONE, NULL, kRuntimeServiceName, - path.c_str(), kRuntimeRunningAppInterface, NULL, &error); + GDBusProxy* proxy = g_dbus_proxy_new_sync( + connection, G_DBUS_PROXY_FLAGS_NONE, NULL, kRuntimeServiceName, + path.c_str(), kRuntimeRunningAppInterface, NULL, &error); if (!proxy) { - std::cerr << "Couldn't create proxy for " << kRuntimeRunningAppInterface << ": " - << error->message << std::endl; + std::cerr << "Couldn't create proxy for " << kRuntimeRunningAppInterface + << ": " << error->message << std::endl; g_error_free(error); return NULL; } @@ -50,7 +53,8 @@ GDBusProxy* CreateRunningAppProxy(const std::string& app_id) { } // namespace -WebSetting::WebSetting(const std::string& app_id) : app_id_(app_id), running_app_proxy_(NULL) {} +WebSetting::WebSetting(const std::string& app_id) + : app_id_(app_id), running_app_proxy_(NULL) {} WebSetting::~WebSetting() { if (running_app_proxy_) g_object_unref(running_app_proxy_); @@ -62,27 +66,32 @@ std::unique_ptr WebSetting::RemoveAllCookies() { return CreateResultMessage(ErrorCode::UNKNOWN_ERR); } GError* error = NULL; - GVariant* result = g_dbus_proxy_call_sync(running_app_proxy_, "RemoveAllCookies", NULL, - G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); + GVariant* result = + g_dbus_proxy_call_sync(running_app_proxy_, "RemoveAllCookies", NULL, + G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); if (!result) { - std::cerr << "Fail to call 'RemoveuserAgentAllCookies':" << error->message << std::endl; + std::cerr << "Fail to call 'RemoveuserAgentAllCookies':" << error->message + << std::endl; g_error_free(error); return CreateResultMessage(ErrorCode::UNKNOWN_ERR); } return CreateResultMessage(); } -std::unique_ptr WebSetting::SetUserAgentString(const std::string& user_agent) { +std::unique_ptr WebSetting::SetUserAgentString( + const std::string& user_agent) { if (!running_app_proxy_) { if (!(running_app_proxy_ = CreateRunningAppProxy(app_id_))) return CreateResultMessage(ErrorCode::UNKNOWN_ERR); } GError* error = NULL; - GVariant* result = g_dbus_proxy_call_sync(running_app_proxy_, "SetUserAgentString", - g_variant_new("(s)", user_agent.c_str()), - G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); + GVariant* result = + g_dbus_proxy_call_sync(running_app_proxy_, "SetUserAgentString", + g_variant_new("(s)", user_agent.c_str()), + G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); if (!result) { - std::cerr << "Fail to call 'SetUserAgentString':" << error->message << std::endl; + std::cerr << "Fail to call 'SetUserAgentString':" << error->message + << std::endl; g_error_free(error); return CreateResultMessage(ErrorCode::UNKNOWN_ERR); } diff --git a/src/websetting/websetting.h b/src/websetting/websetting.h index 390d0c48..8bb5674c 100644 --- a/src/websetting/websetting.h +++ b/src/websetting/websetting.h @@ -17,7 +17,8 @@ class WebSetting { ~WebSetting(); std::unique_ptr RemoveAllCookies(); - std::unique_ptr SetUserAgentString(const std::string& user_agent); + std::unique_ptr SetUserAgentString( + const std::string& user_agent); private: std::string app_id_; diff --git a/src/websetting/websetting_extension_utils.h b/src/websetting/websetting_extension_utils.h index a859284a..8a359658 100644 --- a/src/websetting/websetting_extension_utils.h +++ b/src/websetting/websetting_extension_utils.h @@ -17,25 +17,29 @@ std::unique_ptr CreateResultMessage() { return std::unique_ptr(new picojson::value(obj)); } -std::unique_ptr CreateResultMessage(const common::ErrorCode& error) { +std::unique_ptr CreateResultMessage( + const common::ErrorCode& error) { picojson::object obj; obj["error"] = picojson::value(static_cast(error)); return std::unique_ptr(new picojson::value(obj)); } -std::unique_ptr CreateResultMessage(const picojson::object& data) { +std::unique_ptr CreateResultMessage( + const picojson::object& data) { picojson::object obj; obj["data"] = picojson::value(data); return std::unique_ptr(new picojson::value(obj)); } -std::unique_ptr CreateResultMessage(const picojson::array& data) { +std::unique_ptr CreateResultMessage( + const picojson::array& data) { picojson::object obj; obj["data"] = picojson::value(data); return std::unique_ptr(new picojson::value(obj)); } -std::unique_ptr CreateResultMessage(const picojson::value& data) { +std::unique_ptr CreateResultMessage( + const picojson::value& data) { picojson::object obj; obj["data"] = data; return std::unique_ptr(new picojson::value(obj)); diff --git a/src/websetting/websetting_instance.cc b/src/websetting/websetting_instance.cc index d255c6c5..7fa7af75 100644 --- a/src/websetting/websetting_instance.cc +++ b/src/websetting/websetting_instance.cc @@ -14,7 +14,8 @@ namespace { // The privileges that required in Websetting API -const std::string kPrivilegeWebsetting = "http://tizen.org/privilege/websetting"; +const std::string kPrivilegeWebsetting = + "http://tizen.org/privilege/websetting"; const char kWrtServiceName[] = "wrt-service"; } // namespace @@ -29,11 +30,15 @@ typedef picojson::object JsonObject; typedef picojson::array JsonArray; typedef std::string JsonString; -WebSettingInstance::WebSettingInstance(WebSettingExtension* extension) : extension_(extension) { +WebSettingInstance::WebSettingInstance(WebSettingExtension* extension) + : extension_(extension) { using namespace std::placeholders; -#define REGISTER_ASYNC(c, x) RegisterHandler(c, std::bind(&WebSettingInstance::x, this, _1, _2)); - REGISTER_ASYNC("WebSettingManager_setUserAgentString", WebSettingManagerSetUserAgentString); - REGISTER_ASYNC("WebSettingManager_removeAllCookies", WebSettingManagerRemoveAllCookies); +#define REGISTER_ASYNC(c, x) \ + RegisterHandler(c, std::bind(&WebSettingInstance::x, this, _1, _2)); + REGISTER_ASYNC("WebSettingManager_setUserAgentString", + WebSettingManagerSetUserAgentString); + REGISTER_ASYNC("WebSettingManager_removeAllCookies", + WebSettingManagerRemoveAllCookies); #undef REGISTER_ASYNC } diff --git a/src/websetting/websetting_instance.h b/src/websetting/websetting_instance.h index 200a2a25..86f39f99 100644 --- a/src/websetting/websetting_instance.h +++ b/src/websetting/websetting_instance.h @@ -20,8 +20,10 @@ class WebSettingInstance : public common::ParsedInstance { virtual ~WebSettingInstance(); private: - void WebSettingManagerSetUserAgentString(const picojson::value& args, picojson::object& out); - void WebSettingManagerRemoveAllCookies(const picojson::value& args, picojson::object& out); + void WebSettingManagerSetUserAgentString(const picojson::value& args, + picojson::object& out); + void WebSettingManagerRemoveAllCookies(const picojson::value& args, + picojson::object& out); WebSettingExtension* extension_; };