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

Unified Diff: ui/chromeos/touch_exploration_controller_unittest.cc

Issue 853073002: Update {virtual,override,final} to follow C++11 style in ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « ui/chromeos/touch_exploration_controller.h ('k') | ui/chromeos/user_activity_power_manager_notifier.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/chromeos/touch_exploration_controller_unittest.cc
diff --git a/ui/chromeos/touch_exploration_controller_unittest.cc b/ui/chromeos/touch_exploration_controller_unittest.cc
index 72d20756d498fc9b93508e59c3483ddc4a70a4dc..052b52739a9a1ae5feac63430106dacd975322c8 100644
--- a/ui/chromeos/touch_exploration_controller_unittest.cc
+++ b/ui/chromeos/touch_exploration_controller_unittest.cc
@@ -27,13 +27,13 @@ namespace {
class EventCapturer : public ui::EventHandler {
public:
EventCapturer() {}
- virtual ~EventCapturer() {}
+ ~EventCapturer() override {}
void Reset() {
events_.clear();
}
- virtual void OnEvent(ui::Event* event) override {
+ void OnEvent(ui::Event* event) override {
if (event->IsMouseEvent()) {
events_.push_back(
new ui::MouseEvent(static_cast<ui::MouseEvent&>(*event)));
@@ -75,23 +75,14 @@ int Factorial(int n) {
class MockTouchExplorationControllerDelegate
: public ui::TouchExplorationControllerDelegate {
public:
- virtual void SetOutputLevel(int volume) override {
+ void SetOutputLevel(int volume) override {
volume_changes_.push_back(volume);
}
- virtual void SilenceSpokenFeedback() override {
- }
- virtual void PlayVolumeAdjustEarcon() override {
- ++num_times_adjust_sound_played_;
- }
- virtual void PlayPassthroughEarcon() override {
- ++num_times_passthrough_played_;
- }
- virtual void PlayExitScreenEarcon() override {
- ++num_times_exit_screen_played_;
- }
- virtual void PlayEnterScreenEarcon() override {
- ++num_times_enter_screen_played_;
- }
+ void SilenceSpokenFeedback() override {}
+ void PlayVolumeAdjustEarcon() override { ++num_times_adjust_sound_played_; }
+ void PlayPassthroughEarcon() override { ++num_times_passthrough_played_; }
+ void PlayExitScreenEarcon() override { ++num_times_exit_screen_played_; }
+ void PlayEnterScreenEarcon() override { ++num_times_enter_screen_played_; }
const std::vector<float> VolumeChanges() { return volume_changes_; }
size_t NumAdjustSounds() { return num_times_adjust_sound_played_; }
@@ -202,9 +193,9 @@ class TouchExplorationTest : public aura::test::AuraTestBase {
// Tests fail if time is ever 0.
simulated_clock_->Advance(base::TimeDelta::FromMilliseconds(10));
}
- virtual ~TouchExplorationTest() {}
+ ~TouchExplorationTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
if (gfx::GetGLImplementation() == gfx::kGLImplementationNone)
gfx::GLSurface::InitializeOneOffForTests();
aura::test::AuraTestBase::SetUp();
@@ -217,7 +208,7 @@ class TouchExplorationTest : public aura::test::AuraTestBase {
cursor_client()->DisableMouseEvents();
}
- virtual void TearDown() override {
+ void TearDown() override {
root_window()->RemovePreTargetHandler(&event_capturer_);
SwitchTouchExplorationMode(false);
cursor_client_.reset();
« no previous file with comments | « ui/chromeos/touch_exploration_controller.h ('k') | ui/chromeos/user_activity_power_manager_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698