diff options
| author | mostynb <mostynb@opera.com> | 2014-10-09 00:43:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 07:43:13 +0000 |
| commit | d1ef895e20bd862bb4177104a8964c11b0ad8ae4 (patch) | |
| tree | d3dd913287ba619e120144a10e8ba10de505a587 /ash/system | |
| parent | 0da08db83c07f4598c96b4487960cf44875996c2 (diff) | |
| download | chromium_src-d1ef895e20bd862bb4177104a8964c11b0ad8ae4.zip chromium_src-d1ef895e20bd862bb4177104a8964c11b0ad8ae4.tar.gz chromium_src-d1ef895e20bd862bb4177104a8964c11b0ad8ae4.tar.bz2 | |
change newly added OVERRIDE to override in ash/
R=jonross@chromium.org,flackr@chromium.org,skuhne@chromium.org
BUG=417463
Review URL: https://codereview.chromium.org/634343003
Cr-Commit-Position: refs/heads/master@{#298824}
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/tray/system_tray_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/system/tray/tray_details_view_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc index 4cfe64b..bb37877 100644 --- a/ash/system/tray/system_tray_unittest.cc +++ b/ash/system/tray/system_tray_unittest.cc @@ -167,7 +167,7 @@ class SystemTrayTest : public AshTestBase { SystemTrayTest() {} virtual ~SystemTrayTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableTouchFeedback); test::AshTestBase::SetUp(); diff --git a/ash/system/tray/tray_details_view_unittest.cc b/ash/system/tray/tray_details_view_unittest.cc index 3430c76..a64bd94 100644 --- a/ash/system/tray/tray_details_view_unittest.cc +++ b/ash/system/tray/tray_details_view_unittest.cc @@ -116,7 +116,7 @@ class TrayDetailsViewTest : public AshTestBase { footer()->content()); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableTouchFeedback); test::AshTestBase::SetUp(); |