diff options
| author | suzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 02:40:46 +0000 |
|---|---|---|
| committer | suzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 02:40:46 +0000 |
| commit | 39a749c1cc998edcd66edfc3ffc9004710825f46 (patch) | |
| tree | 370b1a18564e743cfbfc16beb4d0053437064486 /webkit | |
| parent | 911696b92b1b5a666e59433b8b64303a2f4eae62 (diff) | |
| download | chromium_src-39a749c1cc998edcd66edfc3ffc9004710825f46.zip chromium_src-39a749c1cc998edcd66edfc3ffc9004710825f46.tar.gz chromium_src-39a749c1cc998edcd66edfc3ffc9004710825f46.tar.bz2 | |
Change UTF8ToUTF16 to accept const StringPiece&.
BUG=70936
TEST=All unit tests should pass.
Review URL: http://codereview.chromium.org/6317016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/appcache/view_appcache_internals_job.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webclipboard_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/plugins/npapi/plugin_group.cc | 2 | ||||
| -rw-r--r-- | webkit/plugins/npapi/test/plugin_arguments_test.cc | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/appcache/view_appcache_internals_job.cc index b4874db..c165375 100644 --- a/webkit/appcache/view_appcache_internals_job.cc +++ b/webkit/appcache/view_appcache_internals_job.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <algorithm> + #include "webkit/appcache/view_appcache_internals_job.h" #include "base/logging.h" diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 1dfbc3a..4569749 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -145,7 +145,7 @@ void WebClipboardImpl::writeURL(const WebURL& url, const WebString& title) { scw.WriteBookmark(title, url.spec()); scw.WriteHTML(UTF8ToUTF16(URLToMarkup(url, title)), ""); - scw.WriteText(UTF8ToUTF16(url.spec())); + scw.WriteText(UTF8ToUTF16(std::string(url.spec()))); } void WebClipboardImpl::writeImage( diff --git a/webkit/plugins/npapi/plugin_group.cc b/webkit/plugins/npapi/plugin_group.cc index 1884650..7d45aa7 100644 --- a/webkit/plugins/npapi/plugin_group.cc +++ b/webkit/plugins/npapi/plugin_group.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <algorithm> + #include "webkit/plugins/npapi/plugin_group.h" #include "base/linked_ptr.h" diff --git a/webkit/plugins/npapi/test/plugin_arguments_test.cc b/webkit/plugins/npapi/test/plugin_arguments_test.cc index fe1e54e..bab2298 100644 --- a/webkit/plugins/npapi/test/plugin_arguments_test.cc +++ b/webkit/plugins/npapi/test/plugin_arguments_test.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdlib.h> + #include "webkit/plugins/npapi/test/plugin_arguments_test.h" #include "base/basictypes.h" |