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

Side by Side Diff: ui/platform_window/x11/x11_window.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 unified diff | Download patch
« no previous file with comments | « ui/platform_window/win/win_window.h ('k') | ui/shell_dialogs/select_file_dialog_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ 5 #ifndef UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_
6 #define UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ 6 #define UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_
7 7
8 #include "ui/events/platform/platform_event_dispatcher.h" 8 #include "ui/events/platform/platform_event_dispatcher.h"
9 #include "ui/gfx/geometry/rect.h" 9 #include "ui/gfx/geometry/rect.h"
10 #include "ui/gfx/x/x11_atom_cache.h" 10 #include "ui/gfx/x/x11_atom_cache.h"
(...skipping 11 matching lines...) Expand all
22 public: 22 public:
23 explicit X11Window(PlatformWindowDelegate* delegate); 23 explicit X11Window(PlatformWindowDelegate* delegate);
24 virtual ~X11Window(); 24 virtual ~X11Window();
25 25
26 private: 26 private:
27 void Destroy(); 27 void Destroy();
28 28
29 void ProcessXInput2Event(XEvent* xevent); 29 void ProcessXInput2Event(XEvent* xevent);
30 30
31 // PlatformWindow: 31 // PlatformWindow:
32 virtual void Show() OVERRIDE; 32 virtual void Show() override;
33 virtual void Hide() OVERRIDE; 33 virtual void Hide() override;
34 virtual void Close() OVERRIDE; 34 virtual void Close() override;
35 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 35 virtual void SetBounds(const gfx::Rect& bounds) override;
36 virtual gfx::Rect GetBounds() OVERRIDE; 36 virtual gfx::Rect GetBounds() override;
37 virtual void SetCapture() OVERRIDE; 37 virtual void SetCapture() override;
38 virtual void ReleaseCapture() OVERRIDE; 38 virtual void ReleaseCapture() override;
39 virtual void ToggleFullscreen() OVERRIDE; 39 virtual void ToggleFullscreen() override;
40 virtual void Maximize() OVERRIDE; 40 virtual void Maximize() override;
41 virtual void Minimize() OVERRIDE; 41 virtual void Minimize() override;
42 virtual void Restore() OVERRIDE; 42 virtual void Restore() override;
43 virtual void SetCursor(PlatformCursor cursor) OVERRIDE; 43 virtual void SetCursor(PlatformCursor cursor) override;
44 virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE; 44 virtual void MoveCursorTo(const gfx::Point& location) override;
45 45
46 // PlatformEventDispatcher: 46 // PlatformEventDispatcher:
47 virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE; 47 virtual bool CanDispatchEvent(const PlatformEvent& event) override;
48 virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE; 48 virtual uint32_t DispatchEvent(const PlatformEvent& event) override;
49 49
50 PlatformWindowDelegate* delegate_; 50 PlatformWindowDelegate* delegate_;
51 51
52 XDisplay* xdisplay_; 52 XDisplay* xdisplay_;
53 XID xwindow_; 53 XID xwindow_;
54 XID xroot_window_; 54 XID xroot_window_;
55 X11AtomCache atom_cache_; 55 X11AtomCache atom_cache_;
56 56
57 // Setting the bounds is an asynchronous operation in X11. |requested_bounds_| 57 // Setting the bounds is an asynchronous operation in X11. |requested_bounds_|
58 // is the bounds requested using XConfigureWindow, and |confirmed_bounds_| is 58 // is the bounds requested using XConfigureWindow, and |confirmed_bounds_| is
59 // the bounds the X11 server has set on the window. 59 // the bounds the X11 server has set on the window.
60 gfx::Rect requested_bounds_; 60 gfx::Rect requested_bounds_;
61 gfx::Rect confirmed_bounds_; 61 gfx::Rect confirmed_bounds_;
62 62
63 bool window_mapped_; 63 bool window_mapped_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(X11Window); 65 DISALLOW_COPY_AND_ASSIGN(X11Window);
66 }; 66 };
67 67
68 } // namespace ui 68 } // namespace ui
69 69
70 #endif // UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ 70 #endif // UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/platform_window/win/win_window.h ('k') | ui/shell_dialogs/select_file_dialog_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698