From 1c4376810402da75a8084453992fbec5b51f6291 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 5 Feb 2018 14:47:00 +0900 Subject: [PATCH] Coding style fixes --- brightray/common/application_info.cc | 6 +++--- brightray/common/application_info_win.cc | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/brightray/common/application_info.cc b/brightray/common/application_info.cc index 9ae8ba464d7..2286f62c3e0 100644 --- a/brightray/common/application_info.cc +++ b/brightray/common/application_info.cc @@ -4,15 +4,15 @@ namespace brightray { namespace { -std::string overriden_application_name_; +std::string g_overriden_application_name; } void OverrideApplicationName(const std::string& name) { - overriden_application_name_ = name; + g_overriden_application_name = name; } std::string GetOverridenApplicationName() { - return overriden_application_name_; + return g_overriden_application_name; } } // namespace brightray diff --git a/brightray/common/application_info_win.cc b/brightray/common/application_info_win.cc index ceef665ef92..09f094604e5 100644 --- a/brightray/common/application_info_win.cc +++ b/brightray/common/application_info_win.cc @@ -16,7 +16,7 @@ namespace brightray { namespace { -base::string16 app_user_model_id_; +base::string16 g_app_user_model_id; } @@ -37,15 +37,15 @@ std::string GetApplicationVersion() { } void SetAppUserModelID(const base::string16& name) { - app_user_model_id_ = name; - SetCurrentProcessExplicitAppUserModelID(app_user_model_id_.c_str()); + g_app_user_model_id = name; + SetCurrentProcessExplicitAppUserModelID(g_app_user_model_id.c_str()); } PCWSTR GetRawAppUserModelID() { - if (app_user_model_id_.empty()) { + if (g_app_user_model_id.empty()) { PWSTR current_app_id; if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(¤t_app_id))) { - app_user_model_id_ = current_app_id; + g_app_user_model_id = current_app_id; } else { std::string name = GetOverridenApplicationName(); if (name.empty()) { @@ -58,7 +58,7 @@ PCWSTR GetRawAppUserModelID() { CoTaskMemFree(current_app_id); } - return app_user_model_id_.c_str(); + return g_app_user_model_id.c_str(); } bool GetAppUserModelID(ScopedHString* app_id) {