diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 16:39:55 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 16:39:55 +0000 |
| commit | 2dd33556af4a65f74203da2dae298bb622d4e162 (patch) | |
| tree | 809d8e42ae79a2717aff55fc54c9edf582a1d22b /ash/drag_drop/drag_drop_controller_unittest.cc | |
| parent | 7696c408db7500ec57f04e51bd17a4b6d25e1d17 (diff) | |
| download | chromium_src-2dd33556af4a65f74203da2dae298bb622d4e162.zip chromium_src-2dd33556af4a65f74203da2dae298bb622d4e162.tar.gz chromium_src-2dd33556af4a65f74203da2dae298bb622d4e162.tar.bz2 | |
Try 2 - Change how ui::Clipboard is accessed so there's only one per thread.
Currently, there can be any number of Clipboard objects, which can be massively simplified. This removes interfaces for fetching the Clipboard and makes everyone go through a single static ui::Clipboard::GetForCurrentThread() access point.
[Differences from the first patch: this may fix the pdf tests, but since I have no way to run them locally or on a trybot, this is going in blind.]
BUG=130805
R=jam@chromium.org
TBR=tc,ben,dcheng,kaiwang
First Review URL: https://chromiumcodereview.appspot.com/10911074
Review URL: https://chromiumcodereview.appspot.com/10916214
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop/drag_drop_controller_unittest.cc')
| -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 044b496..b7c94e8 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -503,7 +503,7 @@ TEST_F(DragDropControllerTest, ViewRemovedWhileInDragDropTest) { } TEST_F(DragDropControllerTest, DragLeavesClipboardAloneTest) { - ui::Clipboard* cb = views::ViewsDelegate::views_delegate->GetClipboard(); + ui::Clipboard* cb = ui::Clipboard::GetForCurrentThread(); std::string clip_str("I am on the clipboard"); { // We first copy some text to the clipboard. |