diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 12:16:25 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 12:16:25 +0000 |
| commit | 86872e85b726e5339270416e948cb887ecf057c8 (patch) | |
| tree | 0575b09ceb466f4cf33cbc7bad62bed0d81f9af1 /ash/drag_drop/drag_drop_controller_unittest.cc | |
| parent | 1682765344cb63cc02eef46f65e902c5aa5c1c3f (diff) | |
| download | chromium_src-86872e85b726e5339270416e948cb887ecf057c8.zip chromium_src-86872e85b726e5339270416e948cb887ecf057c8.tar.gz chromium_src-86872e85b726e5339270416e948cb887ecf057c8.tar.bz2 | |
ash: Add missing 'virtual' annotations to SetUp() and TearDown() overrides.
BUG=115047
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/11572055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173294 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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 06969eb..90b4084 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -279,7 +279,7 @@ class DragDropControllerTest : public AshTestBase { DragDropControllerTest() : AshTestBase() {} virtual ~DragDropControllerTest() {} - void SetUp() OVERRIDE { + virtual void SetUp() OVERRIDE { AshTestBase::SetUp(); drag_drop_controller_.reset(new TestDragDropController); drag_drop_controller_->set_should_block_during_drag_drop(false); @@ -288,7 +288,7 @@ class DragDropControllerTest : public AshTestBase { views_delegate_.reset(new views::TestViewsDelegate); } - void TearDown() OVERRIDE { + virtual void TearDown() OVERRIDE { aura::client::SetDragDropClient(Shell::GetPrimaryRootWindow(), NULL); drag_drop_controller_.reset(); AshTestBase::TearDown(); |