| Index: ui/views/controls/textfield/textfield_views_model.cc
|
| diff --git a/ui/views/controls/textfield/textfield_views_model.cc b/ui/views/controls/textfield/textfield_views_model.cc
|
| index d51e417e874a6bdfaa55b2d4d019c5c8c90b8196..89fe947f02ebea37968864cc3823fb1ced526ba1 100644
|
| --- a/ui/views/controls/textfield/textfield_views_model.cc
|
| +++ b/ui/views/controls/textfield/textfield_views_model.cc
|
| @@ -20,7 +20,6 @@
|
| #include "ui/gfx/render_text.h"
|
| #include "ui/gfx/text_constants.h"
|
| #include "ui/views/controls/textfield/textfield.h"
|
| -#include "ui/views/views_delegate.h"
|
|
|
| namespace views {
|
|
|
| @@ -511,7 +510,7 @@ bool TextfieldViewsModel::Redo() {
|
| bool TextfieldViewsModel::Cut() {
|
| if (!HasCompositionText() && HasSelection() && !render_text_->is_obscured()) {
|
| ui::ScopedClipboardWriter(
|
| - views::ViewsDelegate::views_delegate->GetClipboard(),
|
| + ui::Clipboard::GetForCurrentThread(),
|
| ui::Clipboard::BUFFER_STANDARD).WriteText(GetSelectedText());
|
| // A trick to let undo/redo handle cursor correctly.
|
| // Undoing CUT moves the cursor to the end of the change rather
|
| @@ -529,7 +528,7 @@ bool TextfieldViewsModel::Cut() {
|
| bool TextfieldViewsModel::Copy() {
|
| if (!HasCompositionText() && HasSelection() && !render_text_->is_obscured()) {
|
| ui::ScopedClipboardWriter(
|
| - views::ViewsDelegate::views_delegate->GetClipboard(),
|
| + ui::Clipboard::GetForCurrentThread(),
|
| ui::Clipboard::BUFFER_STANDARD).WriteText(GetSelectedText());
|
| return true;
|
| }
|
| @@ -538,7 +537,7 @@ bool TextfieldViewsModel::Copy() {
|
|
|
| bool TextfieldViewsModel::Paste() {
|
| string16 result;
|
| - views::ViewsDelegate::views_delegate->GetClipboard()
|
| + ui::Clipboard::GetForCurrentThread()
|
| ->ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
|
| if (!result.empty()) {
|
| InsertTextInternal(result, false);
|
|
|