| Index: ash/wm/panels/panel_window_resizer_unittest.cc
|
| diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc
|
| index 2832d68d65f2cb07085ae69aaad7c417dd802553..83854ce0aad5dea41d8c3326a4864729c70b5601 100644
|
| --- a/ash/wm/panels/panel_window_resizer_unittest.cc
|
| +++ b/ash/wm/panels/panel_window_resizer_unittest.cc
|
| @@ -37,7 +37,7 @@ class PanelWindowResizerTest : public test::AshTestBase {
|
| PanelWindowResizerTest() {}
|
| virtual ~PanelWindowResizerTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| AshTestBase::SetUp();
|
| UpdateDisplay("600x400");
|
| test::ShellTestApi test_api(Shell::GetInstance());
|
| @@ -45,7 +45,7 @@ class PanelWindowResizerTest : public test::AshTestBase {
|
| shelf_delegate_ = test::TestShelfDelegate::instance();
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| AshTestBase::TearDown();
|
| }
|
|
|
| @@ -191,7 +191,7 @@ class PanelWindowResizerTextDirectionTest
|
| PanelWindowResizerTextDirectionTest() : is_rtl_(GetParam()) {}
|
| virtual ~PanelWindowResizerTextDirectionTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| original_locale = l10n_util::GetApplicationLocale(std::string());
|
| if (is_rtl_)
|
| base::i18n::SetICUDefaultLocale("he");
|
| @@ -199,7 +199,7 @@ class PanelWindowResizerTextDirectionTest
|
| ASSERT_EQ(is_rtl_, base::i18n::IsRTL());
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| if (is_rtl_)
|
| base::i18n::SetICUDefaultLocale(original_locale);
|
| PanelWindowResizerTest::TearDown();
|
|
|