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

Unified Diff: ash/test/ui_controls_factory_ash.cc

Issue 683623002: Standardize usage of virtual/override/final specifiers. (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/test/test_volume_control_delegate.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ui_controls_factory_ash.cc
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc
index e80d66ceda877660ffb65ef2aa2bcccf174b17f3..26f8c245b0b4644670361dc61ba57dcc00318177 100644
--- a/ash/test/ui_controls_factory_ash.cc
+++ b/ash/test/ui_controls_factory_ash.cc
@@ -54,28 +54,26 @@ class UIControlsAsh : public UIControlsAura {
public:
UIControlsAsh() {
}
- virtual ~UIControlsAsh() {
- }
+ ~UIControlsAsh() override {}
// UIControslAura overrides:
- virtual bool SendKeyPress(gfx::NativeWindow window,
- ui::KeyboardCode key,
- bool control,
- bool shift,
- bool alt,
- bool command) override {
+ bool SendKeyPress(gfx::NativeWindow window,
+ ui::KeyboardCode key,
+ bool control,
+ bool shift,
+ bool alt,
+ bool command) override {
return SendKeyPressNotifyWhenDone(
window, key, control, shift, alt, command, base::Closure());
}
- virtual bool SendKeyPressNotifyWhenDone(
- gfx::NativeWindow window,
- ui::KeyboardCode key,
- bool control,
- bool shift,
- bool alt,
- bool command,
- const base::Closure& closure) override {
+ bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
+ ui::KeyboardCode key,
+ bool control,
+ bool shift,
+ bool alt,
+ bool command,
+ const base::Closure& closure) override {
aura::Window* root =
window ? window->GetRootWindow() : ash::Shell::GetTargetRootWindow();
UIControlsAura* ui_controls = GetUIControlsForRootWindow(root);
@@ -83,43 +81,43 @@ class UIControlsAsh : public UIControlsAura {
window, key, control, shift, alt, command, closure);
}
- virtual bool SendMouseMove(long x, long y) override {
+ bool SendMouseMove(long x, long y) override {
gfx::Point p(x, y);
UIControlsAura* ui_controls = GetUIControlsAt(p);
return ui_controls && ui_controls->SendMouseMove(p.x(), p.y());
}
- virtual bool SendMouseMoveNotifyWhenDone(
- long x,
- long y,
- const base::Closure& closure) override {
+ bool SendMouseMoveNotifyWhenDone(long x,
+ long y,
+ const base::Closure& closure) override {
gfx::Point p(x, y);
UIControlsAura* ui_controls = GetUIControlsAt(p);
return ui_controls &&
ui_controls->SendMouseMoveNotifyWhenDone(p.x(), p.y(), closure);
}
- virtual bool SendMouseEvents(MouseButton type, int state) override {
+ bool SendMouseEvents(MouseButton type, int state) override {
gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint());
UIControlsAura* ui_controls = GetUIControlsAt(p);
return ui_controls && ui_controls->SendMouseEvents(type, state);
}
- virtual bool SendMouseEventsNotifyWhenDone(
- MouseButton type, int state, const base::Closure& closure) override {
+ bool SendMouseEventsNotifyWhenDone(MouseButton type,
+ int state,
+ const base::Closure& closure) override {
gfx::Point p(aura::Env::GetInstance()->last_mouse_location());
UIControlsAura* ui_controls = GetUIControlsAt(p);
return ui_controls && ui_controls->SendMouseEventsNotifyWhenDone(
type, state, closure);
}
- virtual bool SendMouseClick(MouseButton type) override {
+ bool SendMouseClick(MouseButton type) override {
gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint());
UIControlsAura* ui_controls = GetUIControlsAt(p);
return ui_controls && ui_controls->SendMouseClick(type);
}
- virtual void RunClosureAfterAllPendingUIEvents(
+ void RunClosureAfterAllPendingUIEvents(
const base::Closure& closure) override {
UIControlsAura* ui_controls = GetUIControlsForRootWindow(
ash::Shell::GetTargetRootWindow());
« no previous file with comments | « ash/test/test_volume_control_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698