Index: ash/focus_cycler_unittest.cc |
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc |
index 8855adc6ba976c277cc2ccadaa4b94178cb4b8fe..e8a8ca867ad4b3dd36117fa8f232624a886c83d1 100644 |
--- a/ash/focus_cycler_unittest.cc |
+++ b/ash/focus_cycler_unittest.cc |
@@ -43,17 +43,13 @@ class PanedWidgetDelegate : public views::WidgetDelegate { |
} |
// views::WidgetDelegate. |
- virtual void GetAccessiblePanes(std::vector<views::View*>* panes) override { |
+ void GetAccessiblePanes(std::vector<views::View*>* panes) override { |
std::copy(accessible_panes_.begin(), |
accessible_panes_.end(), |
std::back_inserter(*panes)); |
} |
- virtual views::Widget* GetWidget() override { |
- return widget_; |
- }; |
- virtual const views::Widget* GetWidget() const override { |
- return widget_; |
- } |
+ views::Widget* GetWidget() override { return widget_; }; |
+ const views::Widget* GetWidget() const override { return widget_; } |
private: |
views::Widget* widget_; |
@@ -66,7 +62,7 @@ class FocusCyclerTest : public AshTestBase { |
public: |
FocusCyclerTest() {} |
- virtual void SetUp() override { |
+ void SetUp() override { |
AshTestBase::SetUp(); |
focus_cycler_.reset(new FocusCycler()); |
@@ -74,7 +70,7 @@ class FocusCyclerTest : public AshTestBase { |
ASSERT_TRUE(Shelf::ForPrimaryDisplay()); |
} |
- virtual void TearDown() override { |
+ void TearDown() override { |
if (tray_) { |
GetStatusAreaWidgetDelegate(tray_->GetWidget())-> |
SetFocusCyclerForTesting(NULL); |