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

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

Issue 678073003: 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
Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
index 808bed76e30bf7fb6447d67294a37845ca3e3240..edfc9dc93c1ed51d749b4622fa50fe0dd343e844 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -48,7 +48,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
DesktopWindowTreeHostX11(
internal::NativeWidgetDelegate* native_widget_delegate,
DesktopNativeWidgetAura* desktop_native_widget_aura);
- virtual ~DesktopWindowTreeHostX11();
+ ~DesktopWindowTreeHostX11() override;
// A way of converting an X11 |xid| host window into a |content_window_|.
static aura::Window* GetContentWindowForXID(XID xid);
@@ -87,84 +87,82 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
protected:
// Overridden from DesktopWindowTreeHost:
- virtual void Init(aura::Window* content_window,
- const Widget::InitParams& params) override;
- virtual void OnNativeWidgetCreated(const Widget::InitParams& params) override;
- virtual scoped_ptr<corewm::Tooltip> CreateTooltip() override;
- virtual scoped_ptr<aura::client::DragDropClient>
- CreateDragDropClient(DesktopNativeCursorManager* cursor_manager) override;
- virtual void Close() override;
- virtual void CloseNow() override;
- virtual aura::WindowTreeHost* AsWindowTreeHost() override;
- virtual void ShowWindowWithState(ui::WindowShowState show_state) override;
- virtual void ShowMaximizedWithBounds(
- const gfx::Rect& restored_bounds) override;
- virtual bool IsVisible() const override;
- virtual void SetSize(const gfx::Size& requested_size) override;
- virtual void StackAtTop() override;
- virtual void CenterWindow(const gfx::Size& size) override;
- virtual void GetWindowPlacement(
- gfx::Rect* bounds,
- ui::WindowShowState* show_state) const override;
- virtual gfx::Rect GetWindowBoundsInScreen() const override;
- virtual gfx::Rect GetClientAreaBoundsInScreen() const override;
- virtual gfx::Rect GetRestoredBounds() const override;
- virtual gfx::Rect GetWorkAreaBoundsInScreen() const override;
- virtual void SetShape(gfx::NativeRegion native_region) override;
- virtual void Activate() override;
- virtual void Deactivate() override;
- virtual bool IsActive() const override;
- virtual void Maximize() override;
- virtual void Minimize() override;
- virtual void Restore() override;
- virtual bool IsMaximized() const override;
- virtual bool IsMinimized() const override;
- virtual bool HasCapture() const override;
- virtual void SetAlwaysOnTop(bool always_on_top) override;
- virtual bool IsAlwaysOnTop() const override;
- virtual void SetVisibleOnAllWorkspaces(bool always_visible) override;
- virtual bool SetWindowTitle(const base::string16& title) override;
- virtual void ClearNativeFocus() override;
- virtual Widget::MoveLoopResult RunMoveLoop(
+ void Init(aura::Window* content_window,
+ const Widget::InitParams& params) override;
+ void OnNativeWidgetCreated(const Widget::InitParams& params) override;
+ scoped_ptr<corewm::Tooltip> CreateTooltip() override;
+ scoped_ptr<aura::client::DragDropClient> CreateDragDropClient(
+ DesktopNativeCursorManager* cursor_manager) override;
+ void Close() override;
+ void CloseNow() override;
+ aura::WindowTreeHost* AsWindowTreeHost() override;
+ void ShowWindowWithState(ui::WindowShowState show_state) override;
+ void ShowMaximizedWithBounds(const gfx::Rect& restored_bounds) override;
+ bool IsVisible() const override;
+ void SetSize(const gfx::Size& requested_size) override;
+ void StackAtTop() override;
+ void CenterWindow(const gfx::Size& size) override;
+ void GetWindowPlacement(gfx::Rect* bounds,
+ ui::WindowShowState* show_state) const override;
+ gfx::Rect GetWindowBoundsInScreen() const override;
+ gfx::Rect GetClientAreaBoundsInScreen() const override;
+ gfx::Rect GetRestoredBounds() const override;
+ gfx::Rect GetWorkAreaBoundsInScreen() const override;
+ void SetShape(gfx::NativeRegion native_region) override;
+ void Activate() override;
+ void Deactivate() override;
+ bool IsActive() const override;
+ void Maximize() override;
+ void Minimize() override;
+ void Restore() override;
+ bool IsMaximized() const override;
+ bool IsMinimized() const override;
+ bool HasCapture() const override;
+ void SetAlwaysOnTop(bool always_on_top) override;
+ bool IsAlwaysOnTop() const override;
+ void SetVisibleOnAllWorkspaces(bool always_visible) override;
+ bool SetWindowTitle(const base::string16& title) override;
+ void ClearNativeFocus() override;
+ Widget::MoveLoopResult RunMoveLoop(
const gfx::Vector2d& drag_offset,
Widget::MoveLoopSource source,
Widget::MoveLoopEscapeBehavior escape_behavior) override;
- virtual void EndMoveLoop() override;
- virtual void SetVisibilityChangedAnimationsEnabled(bool value) override;
- virtual bool ShouldUseNativeFrame() const override;
- virtual bool ShouldWindowContentsBeTransparent() const override;
- virtual void FrameTypeChanged() override;
- virtual void SetFullscreen(bool fullscreen) override;
- virtual bool IsFullscreen() const override;
- virtual void SetOpacity(unsigned char opacity) override;
- virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,
- const gfx::ImageSkia& app_icon) override;
- virtual void InitModalType(ui::ModalType modal_type) override;
- virtual void FlashFrame(bool flash_frame) override;
- virtual void OnRootViewLayout() override;
- virtual void OnNativeWidgetFocus() override;
- virtual void OnNativeWidgetBlur() override;
- virtual bool IsAnimatingClosed() const override;
- virtual bool IsTranslucentWindowOpacitySupported() const override;
- virtual void SizeConstraintsChanged() override;
+ void EndMoveLoop() override;
+ void SetVisibilityChangedAnimationsEnabled(bool value) override;
+ bool ShouldUseNativeFrame() const override;
+ bool ShouldWindowContentsBeTransparent() const override;
+ void FrameTypeChanged() override;
+ void SetFullscreen(bool fullscreen) override;
+ bool IsFullscreen() const override;
+ void SetOpacity(unsigned char opacity) override;
+ void SetWindowIcons(const gfx::ImageSkia& window_icon,
+ const gfx::ImageSkia& app_icon) override;
+ void InitModalType(ui::ModalType modal_type) override;
+ void FlashFrame(bool flash_frame) override;
+ void OnRootViewLayout() override;
+ void OnNativeWidgetFocus() override;
+ void OnNativeWidgetBlur() override;
+ bool IsAnimatingClosed() const override;
+ bool IsTranslucentWindowOpacitySupported() const override;
+ void SizeConstraintsChanged() override;
// Overridden from aura::WindowTreeHost:
- virtual ui::EventSource* GetEventSource() override;
- virtual gfx::AcceleratedWidget GetAcceleratedWidget() override;
- virtual void Show() override;
- virtual void Hide() override;
- virtual gfx::Rect GetBounds() const override;
- virtual void SetBounds(const gfx::Rect& requested_bounds) override;
- virtual gfx::Point GetLocationOnNativeScreen() const override;
- virtual void SetCapture() override;
- virtual void ReleaseCapture() override;
- virtual void PostNativeEvent(const base::NativeEvent& native_event) override;
- virtual void SetCursorNative(gfx::NativeCursor cursor) override;
- virtual void MoveCursorToNative(const gfx::Point& location) override;
- virtual void OnCursorVisibilityChangedNative(bool show) override;
+ ui::EventSource* GetEventSource() override;
+ gfx::AcceleratedWidget GetAcceleratedWidget() override;
+ void Show() override;
+ void Hide() override;
+ gfx::Rect GetBounds() const override;
+ void SetBounds(const gfx::Rect& requested_bounds) override;
+ gfx::Point GetLocationOnNativeScreen() const override;
+ void SetCapture() override;
+ void ReleaseCapture() override;
+ void PostNativeEvent(const base::NativeEvent& native_event) override;
+ void SetCursorNative(gfx::NativeCursor cursor) override;
+ void MoveCursorToNative(const gfx::Point& location) override;
+ void OnCursorVisibilityChangedNative(bool show) override;
// Overridden frm ui::EventSource
- virtual ui::EventProcessor* GetEventProcessor() override;
+ ui::EventProcessor* GetEventProcessor() override;
private:
// Initializes our X11 surface to draw on. This method performs all
@@ -235,8 +233,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
void Relayout();
// ui::PlatformEventDispatcher:
- virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
- virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
+ bool CanDispatchEvent(const ui::PlatformEvent& event) override;
+ uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
void DelayedResize(const gfx::Size& size);

Powered by Google App Engine
This is Rietveld 408576698