diff options
| author | dcheng <dcheng@chromium.org> | 2014-09-17 14:23:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-17 21:24:02 +0000 |
| commit | 3749e4e5ae82c3ad4e379d347a115fb2a8ab489b (patch) | |
| tree | 94e406ac9d4d99e7d750c5a570af47decd43e460 /ash/drag_drop | |
| parent | 8722f5bdf2db7537fd9d1f7a381d208ea771d544 (diff) | |
| download | chromium_src-3749e4e5ae82c3ad4e379d347a115fb2a8ab489b.zip chromium_src-3749e4e5ae82c3ad4e379d347a115fb2a8ab489b.tar.gz chromium_src-3749e4e5ae82c3ad4e379d347a115fb2a8ab489b.tar.bz2 | |
Remove clipboard argument from ScopedClipboardWriter constructor.
Unfortunately, early binding to a clipboard on one thread makes it hard
to implement some cleanups in the clipboard IPC handlers for writing
data. Since all existing callers simply pass in the clipboard for the
current thread, this patch removes the constructor parameter in favor of
having ScopedClipboardWriter use it itself internally.
BUG=319285
Review URL: https://codereview.chromium.org/558913003
Cr-Commit-Position: refs/heads/master@{#295344}
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 252b567..e71a3b8 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -628,7 +628,7 @@ TEST_F(DragDropControllerTest, DragLeavesClipboardAloneTest) { std::string clip_str("I am on the clipboard"); { // We first copy some text to the clipboard. - ui::ScopedClipboardWriter scw(cb, ui::CLIPBOARD_TYPE_COPY_PASTE); + ui::ScopedClipboardWriter scw(ui::CLIPBOARD_TYPE_COPY_PASTE); scw.WriteText(base::ASCIIToUTF16(clip_str)); } EXPECT_TRUE(cb->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(), |