| Index: chrome/browser/autocomplete/autocomplete_edit_view_win.cc
|
| ===================================================================
|
| --- chrome/browser/autocomplete/autocomplete_edit_view_win.cc (revision 25640)
|
| +++ chrome/browser/autocomplete/autocomplete_edit_view_win.cc (working copy)
|
| @@ -2180,9 +2180,10 @@
|
| std::wstring AutocompleteEditViewWin::GetClipboardText() const {
|
| // Try text format.
|
| Clipboard* clipboard = g_browser_process->clipboard();
|
| - if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType())) {
|
| + if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType(),
|
| + Clipboard::BUFFER_STANDARD)) {
|
| std::wstring text;
|
| - clipboard->ReadText(&text);
|
| + clipboard->ReadText(Clipboard::BUFFER_STANDARD, &text);
|
|
|
| // Note: Unlike in the find popup and textfield view, here we completely
|
| // remove whitespace strings containing newlines. We assume users are
|
| @@ -2200,7 +2201,8 @@
|
| // and pastes from the URL bar to itself, the text will get fixed up and
|
| // cannonicalized, which is not what the user expects. By pasting in this
|
| // order, we are sure to paste what the user copied.
|
| - if (clipboard->IsFormatAvailable(Clipboard::GetUrlWFormatType())) {
|
| + if (clipboard->IsFormatAvailable(Clipboard::GetUrlWFormatType(),
|
| + Clipboard::BUFFER_STANDARD)) {
|
| std::string url_str;
|
| clipboard->ReadBookmark(NULL, &url_str);
|
| // pass resulting url string through GURL to normalize
|
|
|