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

Unified Diff: ash/wm/panels/panel_layout_manager_unittest.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « ash/wm/panels/panel_layout_manager.cc ('k') | ash/wm/panels/panel_window_event_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 1489972c2e733014037e44f8a9827d0c17da8469..f540d4f8c855fe8dc8191b69b911cbbe70f72d79 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -48,7 +48,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {
PanelLayoutManagerTest() {}
virtual ~PanelLayoutManagerTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
test::AshTestBase::SetUp();
ASSERT_TRUE(test::TestShelfDelegate::instance());
@@ -278,7 +278,7 @@ class PanelLayoutManagerTextDirectionTest
PanelLayoutManagerTextDirectionTest() : is_rtl_(GetParam()) {}
virtual ~PanelLayoutManagerTextDirectionTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
original_locale = l10n_util::GetApplicationLocale(std::string());
if (is_rtl_)
base::i18n::SetICUDefaultLocale("he");
@@ -286,7 +286,7 @@ class PanelLayoutManagerTextDirectionTest
ASSERT_EQ(is_rtl_, base::i18n::IsRTL());
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
if (is_rtl_)
base::i18n::SetICUDefaultLocale(original_locale);
PanelLayoutManagerTest::TearDown();
« no previous file with comments | « ash/wm/panels/panel_layout_manager.cc ('k') | ash/wm/panels/panel_window_event_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698