Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: trunk/src/ash/drag_drop/drag_drop_controller_unittest.cc

Issue 286753002: Revert 270290 "Reduce creation of ViewsDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ash/ash.gyp ('k') | trunk/src/ash/first_run/first_run_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/drag_drop/drag_drop_controller_unittest.cc
===================================================================
--- trunk/src/ash/drag_drop/drag_drop_controller_unittest.cc (revision 270304)
+++ trunk/src/ash/drag_drop/drag_drop_controller_unittest.cc (working copy)
@@ -26,6 +26,7 @@
#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"
@@ -298,6 +299,7 @@
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 {
@@ -342,6 +344,7 @@
protected:
scoped_ptr<TestDragDropController> drag_drop_controller_;
+ scoped_ptr<views::TestViewsDelegate> views_delegate_;
private:
DISALLOW_COPY_AND_ASSIGN(DragDropControllerTest);
« no previous file with comments | « trunk/src/ash/ash.gyp ('k') | trunk/src/ash/first_run/first_run_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698