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

Unified Diff: ui/views/test/ui_controls_factory_desktop_aurax11.cc

Issue 679233002: 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 | « ui/views/test/test_widget_observer.h ('k') | ui/views/test/views_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/ui_controls_factory_desktop_aurax11.cc
diff --git a/ui/views/test/ui_controls_factory_desktop_aurax11.cc b/ui/views/test/ui_controls_factory_desktop_aurax11.cc
index 201f88422c09a1494ffa5b6a2311e5905d7df146..1c5fe850fde06d66695af16416835b68502968b3 100644
--- a/ui/views/test/ui_controls_factory_desktop_aurax11.cc
+++ b/ui/views/test/ui_controls_factory_desktop_aurax11.cc
@@ -68,29 +68,26 @@ class UIControlsDesktopX11 : public UIControlsAura {
XStoreName(x_display_, x_window_, "Chromium UIControlsDesktopX11 Window");
}
- virtual ~UIControlsDesktopX11() {
- XDestroyWindow(x_display_, x_window_);
- }
+ ~UIControlsDesktopX11() override { XDestroyWindow(x_display_, x_window_); }
- 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 {
DCHECK(!command); // No command key on Aura
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 {
DCHECK(!command); // No command key on Aura
aura::WindowTreeHost* host = window->GetHost();
@@ -124,13 +121,12 @@ class UIControlsDesktopX11 : public UIControlsAura {
return true;
}
- virtual bool SendMouseMove(long screen_x, long screen_y) override {
+ bool SendMouseMove(long screen_x, long screen_y) override {
return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::Closure());
}
- virtual bool SendMouseMoveNotifyWhenDone(
- long screen_x,
- long screen_y,
- const base::Closure& closure) override {
+ bool SendMouseMoveNotifyWhenDone(long screen_x,
+ long screen_y,
+ const base::Closure& closure) override {
gfx::Point screen_location(screen_x, screen_y);
gfx::Point root_location = screen_location;
aura::Window* root_window = RootWindowForPoint(screen_location);
@@ -165,13 +161,12 @@ class UIControlsDesktopX11 : public UIControlsAura {
RunClosureAfterAllPendingUIEvents(closure);
return true;
}
- virtual bool SendMouseEvents(MouseButton type, int state) override {
+ bool SendMouseEvents(MouseButton type, int state) override {
return SendMouseEventsNotifyWhenDone(type, state, base::Closure());
}
- virtual bool SendMouseEventsNotifyWhenDone(
- MouseButton type,
- int state,
- const base::Closure& closure) override {
+ bool SendMouseEventsNotifyWhenDone(MouseButton type,
+ int state,
+ const base::Closure& closure) override {
XEvent xevent = {0};
XButtonEvent* xbutton = &xevent.xbutton;
gfx::Point mouse_loc = aura::Env::GetInstance()->last_mouse_location();
@@ -211,10 +206,10 @@ class UIControlsDesktopX11 : public UIControlsAura {
RunClosureAfterAllPendingUIEvents(closure);
return true;
}
- virtual bool SendMouseClick(MouseButton type) override {
+ bool SendMouseClick(MouseButton type) override {
return SendMouseEvents(type, UP | DOWN);
}
- virtual void RunClosureAfterAllPendingUIEvents(
+ void RunClosureAfterAllPendingUIEvents(
const base::Closure& closure) override {
if (closure.is_null())
return;
« no previous file with comments | « ui/views/test/test_widget_observer.h ('k') | ui/views/test/views_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698