diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 19:40:42 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 19:40:42 +0000 |
| commit | 13ecb04b3a06a7e84c95a6b7c99f64529aa03b61 (patch) | |
| tree | 99959aee149a43a0213d14dc448e8c3e1b831733 /webkit | |
| parent | 698f7f43984b1acbc74b0a64fd2205a3ff4efe07 (diff) | |
| download | chromium_src-13ecb04b3a06a7e84c95a6b7c99f64529aa03b61.zip chromium_src-13ecb04b3a06a7e84c95a6b7c99f64529aa03b61.tar.gz chromium_src-13ecb04b3a06a7e84c95a6b7c99f64529aa03b61.tar.bz2 | |
Remove wstring-ness from some more locale variables.
Review URL: http://codereview.chromium.org/3043055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_glue.h | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 1c59ff2..d912494 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -248,7 +248,7 @@ bool FindProxyForUrl(const GURL& url, std::string* proxy_list); // Returns the locale that this instance of webkit is running as. This is of // the form language-country (e.g., en-US or pt-BR). -std::wstring GetWebKitLocale(); +std::string GetWebKitLocale(); // Close current connections. Used for debugging. void CloseCurrentConnections(); diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index f05a5e5..82f7c8d 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -790,8 +790,8 @@ bool IsProtocolSupportedForMedia(const GURL& url) { return false; } -std::wstring GetWebKitLocale() { - return L"en-US"; +std::string GetWebKitLocale() { + return "en-US"; } void CloseCurrentConnections() { |