diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 22:16:05 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 22:16:05 +0000 |
| commit | 65a6150d49263ff6e3135c5631f9ba5eb12823df (patch) | |
| tree | 36f5b8624ae02cc69ae29ade9923404f6fec80b3 /chrome/browser/autocomplete/autocomplete_edit_view_mac.mm | |
| parent | 9f53c7d5f1ce83bb2025b1797300c6d60dd7d8ff (diff) | |
| download | chromium_src-65a6150d49263ff6e3135c5631f9ba5eb12823df.zip chromium_src-65a6150d49263ff6e3135c5631f9ba5eb12823df.tar.gz chromium_src-65a6150d49263ff6e3135c5631f9ba5eb12823df.tar.bz2 | |
Roll webkit deps 48155:48185 and remove a couple of passing tests from test_expectations.txt.
Also, merge in http://codereview.chromium.org/174367 (original author: vandebo@chromium.org), which is the downstream half of r48168.
BUG=4360
BUG=21228
BUG=18792
TEST=none
TBR=eroman
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit_view_mac.mm')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_mac.mm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm index 83b6214..94a9af6 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm @@ -661,9 +661,10 @@ std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) { // 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 @@ std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) { // 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 |