summaryrefslogtreecommitdiffstats
path: root/base/values.h
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 16:58:12 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 16:58:12 +0000
commitff4c1d8cd62bad8351b44ee39145e5a6dc8fdf7f (patch)
tree8a8d04fe8c8ec3d1c1be30d13c92cb7d7b73561b /base/values.h
parent9792cc8882b31a267d1326a722aac80f053da0e0 (diff)
downloadchromium_src-ff4c1d8cd62bad8351b44ee39145e5a6dc8fdf7f.zip
chromium_src-ff4c1d8cd62bad8351b44ee39145e5a6dc8fdf7f.tar.gz
chromium_src-ff4c1d8cd62bad8351b44ee39145e5a6dc8fdf7f.tar.bz2
Rename DictionaryValue's SetStringFromUTF16() to SetString() (and overload).
Also do a bunch of drive-by changes while I'm at it. Still to do: rename GetStringAsUTF16() to GetString(). BUG=none TEST=builds everywhere, tests pass Review URL: http://codereview.chromium.org/3033050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/values.h')
-rw-r--r--base/values.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/base/values.h b/base/values.h
index 57139d8..39683a6 100644
--- a/base/values.h
+++ b/base/values.h
@@ -253,16 +253,18 @@ class DictionaryValue : public Value {
void SetInteger(const std::string& path, int in_value);
void SetReal(const std::string& path, double in_value);
void SetString(const std::string& path, const std::string& in_value);
- void SetStringFromUTF16(const std::string& path, const string16& in_value);
+ void SetString(const std::string& path, const string16& in_value);
/*DEPRECATED*/void SetBoolean(const std::wstring& path, bool in_value);
/*DEPRECATED*/void SetInteger(const std::wstring& path, int in_value);
/*DEPRECATED*/void SetReal(const std::wstring& path, double in_value);
/*DEPRECATED*/void SetString(const std::wstring& path,
const std::string& in_value);
/*DEPRECATED*/void SetString(const std::wstring& path,
+ const string16& in_value);
+#if !defined(WCHAR_T_IS_UTF16)
+ /*DEPRECATED*/void SetString(const std::wstring& path,
const std::wstring& in_value);
- /*DEPRECATED*/void SetStringFromUTF16(const std::wstring& path,
- const string16& in_value);
+#endif
// Like Set(), but without special treatment of '.'. This allows e.g. URLs to
// be used as paths.