| Index: base/file_version_info_mac.mm
|
| ===================================================================
|
| --- base/file_version_info_mac.mm (revision 28166)
|
| +++ base/file_version_info_mac.mm (working copy)
|
| @@ -9,6 +9,7 @@
|
| #include "base/file_path.h"
|
| #include "base/logging.h"
|
| #include "base/string_util.h"
|
| +#include "base/utf_string_conversions.h"
|
|
|
| FileVersionInfo::FileVersionInfo(NSBundle *bundle) : bundle_(bundle) {
|
| [bundle_ retain];
|
| @@ -43,15 +44,15 @@
|
| }
|
|
|
| std::wstring FileVersionInfo::company_name() {
|
| - return L"";
|
| + return std::wstring();
|
| }
|
|
|
| std::wstring FileVersionInfo::company_short_name() {
|
| - return L"";
|
| + return std::wstring();
|
| }
|
|
|
| std::wstring FileVersionInfo::internal_name() {
|
| - return L"";
|
| + return std::wstring();
|
| }
|
|
|
| std::wstring FileVersionInfo::product_name() {
|
| @@ -63,7 +64,7 @@
|
| }
|
|
|
| std::wstring FileVersionInfo::comments() {
|
| - return L"";
|
| + return std::wstring();
|
| }
|
|
|
| std::wstring FileVersionInfo::legal_copyright() {
|
| @@ -75,22 +76,22 @@
|
| }
|
|
|
| std::wstring FileVersionInfo::file_description() {
|
| - return L"";
|
| + return std::wstring();
|
| }
|
|
|
| std::wstring FileVersionInfo::legal_trademarks() {
|
| - return L"";
|
| + return std::wstring();
|
| }
|
|
|
| std::wstring FileVersionInfo::private_build() {
|
| - return L"";
|
| + return std::wstring();
|
| }
|
|
|
| std::wstring FileVersionInfo::file_version() {
|
| // CFBundleVersion has limitations that may not be honored by a
|
| // proper Chromium version number, so try KSVersion first.
|
| std::wstring version = GetStringValue(L"KSVersion");
|
| - if (version == L"")
|
| + if (version.empty())
|
| version = GetStringValue(L"CFBundleVersion");
|
| return version;
|
| }
|
| @@ -100,7 +101,7 @@
|
| }
|
|
|
| std::wstring FileVersionInfo::special_build() {
|
| - return L"";
|
| + return std::wstring();
|
| }
|
|
|
| std::wstring FileVersionInfo::last_change() {
|
| @@ -132,5 +133,5 @@
|
| std::wstring str;
|
| if (GetValue(name, &str))
|
| return str;
|
| - return L"";
|
| + return std::wstring();
|
| }
|
|
|