diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 19:21:31 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 19:21:31 +0000 |
| commit | 8275835e508fb36328dd79c338d31bbf98eadf56 (patch) | |
| tree | f78d6d976f6bad03de09a82d550943068db096a3 /webkit/glue/webclipboard_impl.cc | |
| parent | 460d2fd0876fddb9e6a2a17cba9c70beb93dfa03 (diff) | |
| download | chromium_src-8275835e508fb36328dd79c338d31bbf98eadf56.zip chromium_src-8275835e508fb36328dd79c338d31bbf98eadf56.tar.gz chromium_src-8275835e508fb36328dd79c338d31bbf98eadf56.tar.bz2 | |
Replace string16 with base::string16 in src/webkit
BUG=
Review URL: https://codereview.chromium.org/13219005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webclipboard_impl.cc')
| -rw-r--r-- | webkit/glue/webclipboard_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 6501d6f..3cbe45c 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -113,7 +113,7 @@ bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) { WebVector<WebString> WebClipboardImpl::readAvailableTypes( Buffer buffer, bool* contains_filenames) { ui::Clipboard::Buffer buffer_type; - std::vector<string16> types; + std::vector<base::string16> types; if (ConvertBufferType(buffer, &buffer_type)) { client_->ReadAvailableTypes(buffer_type, &types, contains_filenames); } @@ -127,7 +127,7 @@ WebString WebClipboardImpl::readPlainText(Buffer buffer) { if (client_->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(), buffer_type)) { - string16 text; + base::string16 text; client_->ReadText(buffer_type, &text); if (!text.empty()) return text; @@ -151,7 +151,7 @@ WebString WebClipboardImpl::readHTML(Buffer buffer, WebURL* source_url, if (!ConvertBufferType(buffer, &buffer_type)) return WebString(); - string16 html_stdstr; + base::string16 html_stdstr; GURL gurl; client_->ReadHTML(buffer_type, &html_stdstr, &gurl, static_cast<uint32*>(fragment_start), @@ -176,7 +176,7 @@ WebString WebClipboardImpl::readCustomData(Buffer buffer, if (!ConvertBufferType(buffer, &buffer_type)) return WebString(); - string16 data; + base::string16 data; client_->ReadCustomData(buffer_type, type, &data); return data; } |