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 /chrome/renderer | |
| 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 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/localized_error.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/renderer_webkitclient_impl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index 00898e4..386e75b3 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -226,7 +226,7 @@ void GetLocalizedErrorValues(const WebURLError& error, if (learn_more_url.is_valid()) { // Add the language parameter to the URL. std::string query = learn_more_url.query() + "&hl=" + - WideToASCII(webkit_glue::GetWebKitLocale()); + webkit_glue::GetWebKitLocale(); GURL::Replacements repl; repl.SetQueryStr(query); learn_more_url = learn_more_url.ReplaceComponents(repl); diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index fb6b3b1..c0e4b85 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -225,7 +225,7 @@ void RendererWebKitClientImpl::cacheMetadata( WebString RendererWebKitClientImpl::defaultLocale() { // TODO(darin): Eliminate this webkit_glue call. - return WideToUTF16(webkit_glue::GetWebKitLocale()); + return ASCIIToUTF16(webkit_glue::GetWebKitLocale()); } void RendererWebKitClientImpl::suddenTerminationChanged(bool enabled) { |