diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 14:08:11 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 14:08:11 +0000 |
| commit | 93e828f68d9fa073d4acbcf9b156688f3a800585 (patch) | |
| tree | c9118514d5a308d50f83a6291eed412b5c75be72 /ash/drag_drop | |
| parent | fbd06ad494c125a3834483a1e6987d3e2ca64618 (diff) | |
| download | chromium_src-93e828f68d9fa073d4acbcf9b156688f3a800585.zip chromium_src-93e828f68d9fa073d4acbcf9b156688f3a800585.tar.gz chromium_src-93e828f68d9fa073d4acbcf9b156688f3a800585.tar.bz2 | |
Reduce creation of ViewsDelegate
By consolidating override of OnBeforeWidgetInit that finds shell many
of the places that were setting a viewsdelegate no longer need to.
Also, made AshTestHelper install a ViewsDelegate so that tests don't have.
Because of removed an include of views_delegate from ash_test_helper I had to update some includes.
BUG=none
TEST=none
R=ben@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270290
Review URL: https://codereview.chromium.org/280863002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 9ef0b9b..7e84ed4 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -26,7 +26,6 @@ #include "ui/events/gestures/gesture_types.h" #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/image/image_skia_rep.h" -#include "ui/views/test/test_views_delegate.h" #include "ui/views/view.h" #include "ui/views/views_delegate.h" #include "ui/views/widget/native_widget_aura.h" @@ -299,7 +298,6 @@ class DragDropControllerTest : public AshTestBase { drag_drop_controller_->set_should_block_during_drag_drop(false); aura::client::SetDragDropClient(Shell::GetPrimaryRootWindow(), drag_drop_controller_.get()); - views_delegate_.reset(new views::TestViewsDelegate); } virtual void TearDown() OVERRIDE { @@ -344,7 +342,6 @@ class DragDropControllerTest : public AshTestBase { protected: scoped_ptr<TestDragDropController> drag_drop_controller_; - scoped_ptr<views::TestViewsDelegate> views_delegate_; private: DISALLOW_COPY_AND_ASSIGN(DragDropControllerTest); |