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

Unified Diff: ui/platform_window/x11/x11_window.h

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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/gl/gpu_timing.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/platform_window/x11/x11_window.h
diff --git a/ui/platform_window/x11/x11_window.h b/ui/platform_window/x11/x11_window.h
index 6e1184cb5a731dbdfa8faf098db4cf1354ac954c..eb759121260de89ee648883985f66232558e9c17 100644
--- a/ui/platform_window/x11/x11_window.h
+++ b/ui/platform_window/x11/x11_window.h
@@ -21,7 +21,7 @@ class X11_WINDOW_EXPORT X11Window : public PlatformWindow,
public PlatformEventDispatcher {
public:
explicit X11Window(PlatformWindowDelegate* delegate);
- virtual ~X11Window();
+ ~X11Window() override;
private:
void Destroy();
@@ -29,23 +29,23 @@ class X11_WINDOW_EXPORT X11Window : public PlatformWindow,
void ProcessXInput2Event(XEvent* xevent);
// PlatformWindow:
- virtual void Show() override;
- virtual void Hide() override;
- virtual void Close() override;
- virtual void SetBounds(const gfx::Rect& bounds) override;
- virtual gfx::Rect GetBounds() override;
- virtual void SetCapture() override;
- virtual void ReleaseCapture() override;
- virtual void ToggleFullscreen() override;
- virtual void Maximize() override;
- virtual void Minimize() override;
- virtual void Restore() override;
- virtual void SetCursor(PlatformCursor cursor) override;
- virtual void MoveCursorTo(const gfx::Point& location) override;
+ void Show() override;
+ void Hide() override;
+ void Close() override;
+ void SetBounds(const gfx::Rect& bounds) override;
+ gfx::Rect GetBounds() override;
+ void SetCapture() override;
+ void ReleaseCapture() override;
+ void ToggleFullscreen() override;
+ void Maximize() override;
+ void Minimize() override;
+ void Restore() override;
+ void SetCursor(PlatformCursor cursor) override;
+ void MoveCursorTo(const gfx::Point& location) override;
// PlatformEventDispatcher:
- virtual bool CanDispatchEvent(const PlatformEvent& event) override;
- virtual uint32_t DispatchEvent(const PlatformEvent& event) override;
+ bool CanDispatchEvent(const PlatformEvent& event) override;
+ uint32_t DispatchEvent(const PlatformEvent& event) override;
PlatformWindowDelegate* delegate_;
« no previous file with comments | « ui/gl/gpu_timing.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698