| Index: ash/focus_cycler_unittest.cc
|
| diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
|
| index 74569d300016bee6579f679ece343893af9cf4ba..8855adc6ba976c277cc2ccadaa4b94178cb4b8fe 100644
|
| --- a/ash/focus_cycler_unittest.cc
|
| +++ b/ash/focus_cycler_unittest.cc
|
| @@ -43,15 +43,15 @@ class PanedWidgetDelegate : public views::WidgetDelegate {
|
| }
|
|
|
| // views::WidgetDelegate.
|
| - virtual void GetAccessiblePanes(std::vector<views::View*>* panes) OVERRIDE {
|
| + virtual 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 {
|
| + virtual views::Widget* GetWidget() override {
|
| return widget_;
|
| };
|
| - virtual const views::Widget* GetWidget() const OVERRIDE {
|
| + virtual const views::Widget* GetWidget() const override {
|
| return widget_;
|
| }
|
|
|
| @@ -66,7 +66,7 @@ class FocusCyclerTest : public AshTestBase {
|
| public:
|
| FocusCyclerTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| AshTestBase::SetUp();
|
|
|
| focus_cycler_.reset(new FocusCycler());
|
| @@ -74,7 +74,7 @@ class FocusCyclerTest : public AshTestBase {
|
| ASSERT_TRUE(Shelf::ForPrimaryDisplay());
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| if (tray_) {
|
| GetStatusAreaWidgetDelegate(tray_->GetWidget())->
|
| SetFocusCyclerForTesting(NULL);
|
|
|