ui/views/controls/textfield/textfield_views_model_unittest.cc - Issue 10911074: Change how ui::Clipboard is accessed so there's only one per thread.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/textfield/textfield_views_model_unittest.cc

Issue 10911074: Change how ui::Clipboard is accessed so there's only one per thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixes for kaiwang Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/views/controls/textfield/textfield_views_model_unittest.cc

diff --git a/ui/views/controls/textfield/textfield_views_model_unittest.cc b/ui/views/controls/textfield/textfield_views_model_unittest.cc

index 376f7d4dc8d34e7b0b90f43892f3da6665aac9de..a94bf4d5aaeb361b190907e42a421c5b090060ad 100644

--- a/ui/views/controls/textfield/textfield_views_model_unittest.cc

+++ b/ui/views/controls/textfield/textfield_views_model_unittest.cc

@@ -18,7 +18,6 @@

#include "ui/views/controls/textfield/textfield_views_model.h"

#include "ui/views/test/test_views_delegate.h"

#include "ui/views/test/views_test_base.h"

-#include "ui/views/views_delegate.h"

#if defined(OS_WIN)

#include "base/win/windows_version.h"

@@ -495,7 +494,7 @@ TEST_F(TextfieldViewsModelTest, SetText) {

#endif

TEST_F(TextfieldViewsModelTest, MAYBE_Clipboard) {

ui::Clipboard* clipboard

- = views::ViewsDelegate::views_delegate->GetClipboard();

+ = ui::Clipboard::GetForCurrentThread();

string16 initial_clipboard_text = ASCIIToUTF16("initial text");

ui::ScopedClipboardWriter(

clipboard,