Index: chrome/browser/autocomplete/autocomplete_edit_view_mac.mm |
=================================================================== |
--- chrome/browser/autocomplete/autocomplete_edit_view_mac.mm (revision 25640) |
+++ chrome/browser/autocomplete/autocomplete_edit_view_mac.mm (working copy) |
@@ -661,9 +661,10 @@ |
// will too. |
DCHECK(clipboard); |
- if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType())) { |
+ if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType(), |
+ Clipboard::BUFFER_STANDARD)) { |
string16 text16; |
- clipboard->ReadText(&text16); |
+ clipboard->ReadText(Clipboard::BUFFER_STANDARD, &text16); |
// Note: Unlike in the find popup and textfield view, here we completely |
// remove whitespace strings containing newlines. We assume users are |
@@ -681,7 +682,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 |