summaryrefslogtreecommitdiffstats
path: root/base/sys_info_posix.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 02:10:20 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 02:10:20 +0000
commit047a03f4cefa75a67070f08b3f6b727f7ea702d5 (patch)
treed00ccbd9e59106de8fd904b06720be59219d61fe /base/sys_info_posix.cc
parent0511c153260e5d402d7552ff7b47a2acb17bdf2b (diff)
downloadchromium_src-047a03f4cefa75a67070f08b3f6b727f7ea702d5.zip
chromium_src-047a03f4cefa75a67070f08b3f6b727f7ea702d5.tar.gz
chromium_src-047a03f4cefa75a67070f08b3f6b727f7ea702d5.tar.bz2
Copy the relevant parts of ICU to a new file base/third_party/icu/icu_utf.*
so we can do basic UTF8/16/32 conversions without linking all of ICU. Change callers who used to call SysUTF8ToWide/SysWideToUTF8 in base to using these new functions. I will remove the Sys versions of these functions in a later patch. TEST=none BUG=none Review URL: http://codereview.chromium.org/243102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sys_info_posix.cc')
-rw-r--r--base/sys_info_posix.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc
index 06f7526..74a10ac 100644
--- a/base/sys_info_posix.cc
+++ b/base/sys_info_posix.cc
@@ -2,9 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/file_util.h"
#include "base/sys_info.h"
-#include "base/basictypes.h"
#include <errno.h>
#include <string.h>
@@ -23,8 +21,10 @@
#include <sys/sysctl.h>
#endif
+#include "base/basictypes.h"
+#include "base/file_util.h"
#include "base/logging.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
namespace base {
@@ -105,7 +105,7 @@ std::wstring SysInfo::GetEnvVar(const wchar_t* var) {
std::string var_utf8 = WideToUTF8(std::wstring(var));
char* value = getenv(var_utf8.c_str());
if (!value) {
- return L"";
+ return std::wstring();
} else {
return UTF8ToWide(value);
}