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 /views/controls/textfield/native_textfield_win.cc | |
| 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 'views/controls/textfield/native_textfield_win.cc')
| -rw-r--r-- | views/controls/textfield/native_textfield_win.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc index 6bae442..e152dbe 100644 --- a/views/controls/textfield/native_textfield_win.cc +++ b/views/controls/textfield/native_textfield_win.cc @@ -664,11 +664,12 @@ void NativeTextfieldWin::OnPaste() { return; Clipboard* clipboard = ViewsDelegate::views_delegate->GetClipboard(); - if (!clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType())) + if (!clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType(), + Clipboard::BUFFER_STANDARD)) return; std::wstring clipboard_str; - clipboard->ReadText(&clipboard_str); + clipboard->ReadText(Clipboard::BUFFER_STANDARD, &clipboard_str); if (!clipboard_str.empty()) { std::wstring collapsed(CollapseWhitespace(clipboard_str, false)); if (textfield_->style() & Textfield::STYLE_LOWERCASE) |