Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h |
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h |
index 6b8d93d8bacad9b00269687544998105b3e60d5f..3bd79a9c9ed7ce51fb592bdf6cbc5deb737996d0 100644 |
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h |
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h |
@@ -63,7 +63,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura |
public aura::WindowTreeHostObserver { |
public: |
explicit DesktopNativeWidgetAura(internal::NativeWidgetDelegate* delegate); |
- virtual ~DesktopNativeWidgetAura(); |
+ ~DesktopNativeWidgetAura() override; |
// Maps from window to DesktopNativeWidgetAura. |window| must be a root |
// window. |
@@ -95,144 +95,142 @@ class VIEWS_EXPORT DesktopNativeWidgetAura |
protected: |
// Overridden from internal::NativeWidgetPrivate: |
- virtual void InitNativeWidget(const Widget::InitParams& params) override; |
- virtual NonClientFrameView* CreateNonClientFrameView() override; |
- virtual bool ShouldUseNativeFrame() const override; |
- virtual bool ShouldWindowContentsBeTransparent() const override; |
- virtual void FrameTypeChanged() override; |
- virtual Widget* GetWidget() override; |
- virtual const Widget* GetWidget() const override; |
- virtual gfx::NativeView GetNativeView() const override; |
- virtual gfx::NativeWindow GetNativeWindow() const override; |
- virtual Widget* GetTopLevelWidget() override; |
- virtual const ui::Compositor* GetCompositor() const override; |
- virtual ui::Compositor* GetCompositor() override; |
- virtual ui::Layer* GetLayer() override; |
- virtual void ReorderNativeViews() override; |
- virtual void ViewRemoved(View* view) override; |
- virtual void SetNativeWindowProperty(const char* name, void* value) override; |
- virtual void* GetNativeWindowProperty(const char* name) const override; |
- virtual TooltipManager* GetTooltipManager() const override; |
- virtual void SetCapture() override; |
- virtual void ReleaseCapture() override; |
- virtual bool HasCapture() const override; |
- virtual InputMethod* CreateInputMethod() override; |
- virtual internal::InputMethodDelegate* GetInputMethodDelegate() override; |
- virtual ui::InputMethod* GetHostInputMethod() override; |
- virtual void CenterWindow(const gfx::Size& size) override; |
- virtual void GetWindowPlacement( |
- gfx::Rect* bounds, |
- ui::WindowShowState* maximized) const override; |
- virtual bool SetWindowTitle(const base::string16& title) override; |
- virtual void SetWindowIcons(const gfx::ImageSkia& window_icon, |
- const gfx::ImageSkia& app_icon) override; |
- virtual void InitModalType(ui::ModalType modal_type) override; |
- virtual gfx::Rect GetWindowBoundsInScreen() const override; |
- virtual gfx::Rect GetClientAreaBoundsInScreen() const override; |
- virtual gfx::Rect GetRestoredBounds() const override; |
- virtual void SetBounds(const gfx::Rect& bounds) override; |
- virtual void SetSize(const gfx::Size& size) override; |
- virtual void StackAbove(gfx::NativeView native_view) override; |
- virtual void StackAtTop() override; |
- virtual void StackBelow(gfx::NativeView native_view) override; |
- virtual void SetShape(gfx::NativeRegion shape) override; |
- virtual void Close() override; |
- virtual void CloseNow() override; |
- virtual void Show() override; |
- virtual void Hide() override; |
- virtual void ShowMaximizedWithBounds( |
- const gfx::Rect& restored_bounds) override; |
- virtual void ShowWithWindowState(ui::WindowShowState state) override; |
- virtual bool IsVisible() const override; |
- virtual void Activate() override; |
- virtual void Deactivate() override; |
- virtual bool IsActive() const override; |
- virtual void SetAlwaysOnTop(bool always_on_top) override; |
- virtual bool IsAlwaysOnTop() const override; |
- virtual void SetVisibleOnAllWorkspaces(bool always_visible) override; |
- virtual void Maximize() override; |
- virtual void Minimize() override; |
- virtual bool IsMaximized() const override; |
- virtual bool IsMinimized() const override; |
- virtual void Restore() override; |
- virtual void SetFullscreen(bool fullscreen) override; |
- virtual bool IsFullscreen() const override; |
- virtual void SetOpacity(unsigned char opacity) override; |
- virtual void SetUseDragFrame(bool use_drag_frame) override; |
- virtual void FlashFrame(bool flash_frame) override; |
- virtual void RunShellDrag(View* view, |
- const ui::OSExchangeData& data, |
- const gfx::Point& location, |
- int operation, |
- ui::DragDropTypes::DragEventSource source) override; |
- virtual void SchedulePaintInRect(const gfx::Rect& rect) override; |
- virtual void SetCursor(gfx::NativeCursor cursor) override; |
- virtual bool IsMouseEventsEnabled() const override; |
- virtual void ClearNativeFocus() override; |
- virtual gfx::Rect GetWorkAreaBoundsInScreen() const override; |
- virtual Widget::MoveLoopResult RunMoveLoop( |
+ void InitNativeWidget(const Widget::InitParams& params) override; |
+ NonClientFrameView* CreateNonClientFrameView() override; |
+ bool ShouldUseNativeFrame() const override; |
+ bool ShouldWindowContentsBeTransparent() const override; |
+ void FrameTypeChanged() override; |
+ Widget* GetWidget() override; |
+ const Widget* GetWidget() const override; |
+ gfx::NativeView GetNativeView() const override; |
+ gfx::NativeWindow GetNativeWindow() const override; |
+ Widget* GetTopLevelWidget() override; |
+ const ui::Compositor* GetCompositor() const override; |
+ ui::Compositor* GetCompositor() override; |
+ ui::Layer* GetLayer() override; |
+ void ReorderNativeViews() override; |
+ void ViewRemoved(View* view) override; |
+ void SetNativeWindowProperty(const char* name, void* value) override; |
+ void* GetNativeWindowProperty(const char* name) const override; |
+ TooltipManager* GetTooltipManager() const override; |
+ void SetCapture() override; |
+ void ReleaseCapture() override; |
+ bool HasCapture() const override; |
+ InputMethod* CreateInputMethod() override; |
+ internal::InputMethodDelegate* GetInputMethodDelegate() override; |
+ ui::InputMethod* GetHostInputMethod() override; |
+ void CenterWindow(const gfx::Size& size) override; |
+ void GetWindowPlacement(gfx::Rect* bounds, |
+ ui::WindowShowState* maximized) const override; |
+ bool SetWindowTitle(const base::string16& title) override; |
+ void SetWindowIcons(const gfx::ImageSkia& window_icon, |
+ const gfx::ImageSkia& app_icon) override; |
+ void InitModalType(ui::ModalType modal_type) override; |
+ gfx::Rect GetWindowBoundsInScreen() const override; |
+ gfx::Rect GetClientAreaBoundsInScreen() const override; |
+ gfx::Rect GetRestoredBounds() const override; |
+ void SetBounds(const gfx::Rect& bounds) override; |
+ void SetSize(const gfx::Size& size) override; |
+ void StackAbove(gfx::NativeView native_view) override; |
+ void StackAtTop() override; |
+ void StackBelow(gfx::NativeView native_view) override; |
+ void SetShape(gfx::NativeRegion shape) override; |
+ void Close() override; |
+ void CloseNow() override; |
+ void Show() override; |
+ void Hide() override; |
+ void ShowMaximizedWithBounds(const gfx::Rect& restored_bounds) override; |
+ void ShowWithWindowState(ui::WindowShowState state) override; |
+ bool IsVisible() const override; |
+ void Activate() override; |
+ void Deactivate() override; |
+ bool IsActive() const override; |
+ void SetAlwaysOnTop(bool always_on_top) override; |
+ bool IsAlwaysOnTop() const override; |
+ void SetVisibleOnAllWorkspaces(bool always_visible) override; |
+ void Maximize() override; |
+ void Minimize() override; |
+ bool IsMaximized() const override; |
+ bool IsMinimized() const override; |
+ void Restore() override; |
+ void SetFullscreen(bool fullscreen) override; |
+ bool IsFullscreen() const override; |
+ void SetOpacity(unsigned char opacity) override; |
+ void SetUseDragFrame(bool use_drag_frame) override; |
+ void FlashFrame(bool flash_frame) override; |
+ void RunShellDrag(View* view, |
+ const ui::OSExchangeData& data, |
+ const gfx::Point& location, |
+ int operation, |
+ ui::DragDropTypes::DragEventSource source) override; |
+ void SchedulePaintInRect(const gfx::Rect& rect) override; |
+ void SetCursor(gfx::NativeCursor cursor) override; |
+ bool IsMouseEventsEnabled() const override; |
+ void ClearNativeFocus() override; |
+ gfx::Rect GetWorkAreaBoundsInScreen() const 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 ui::NativeTheme* GetNativeTheme() const override; |
- virtual void OnRootViewLayout() override; |
- virtual bool IsTranslucentWindowOpacitySupported() const override; |
- virtual void OnSizeConstraintsChanged() override; |
- virtual void RepostNativeEvent(gfx::NativeEvent native_event) override; |
+ void EndMoveLoop() override; |
+ void SetVisibilityChangedAnimationsEnabled(bool value) override; |
+ ui::NativeTheme* GetNativeTheme() const override; |
+ void OnRootViewLayout() override; |
+ bool IsTranslucentWindowOpacitySupported() const override; |
+ void OnSizeConstraintsChanged() override; |
+ void RepostNativeEvent(gfx::NativeEvent native_event) override; |
// Overridden from aura::WindowDelegate: |
- virtual gfx::Size GetMinimumSize() const override; |
- virtual gfx::Size GetMaximumSize() const override; |
- virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
- const gfx::Rect& new_bounds) override {} |
- virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override; |
- virtual int GetNonClientComponent(const gfx::Point& point) const override; |
- virtual bool ShouldDescendIntoChildForEventHandling( |
+ gfx::Size GetMinimumSize() const override; |
+ gfx::Size GetMaximumSize() const override; |
+ void OnBoundsChanged(const gfx::Rect& old_bounds, |
+ const gfx::Rect& new_bounds) override {} |
+ gfx::NativeCursor GetCursor(const gfx::Point& point) override; |
+ int GetNonClientComponent(const gfx::Point& point) const override; |
+ bool ShouldDescendIntoChildForEventHandling( |
aura::Window* child, |
const gfx::Point& location) override; |
- virtual bool CanFocus() override; |
- virtual void OnCaptureLost() override; |
- virtual void OnPaint(gfx::Canvas* canvas) override; |
- virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; |
- virtual void OnWindowDestroying(aura::Window* window) override; |
- virtual void OnWindowDestroyed(aura::Window* window) override; |
- virtual void OnWindowTargetVisibilityChanged(bool visible) override; |
- virtual bool HasHitTestMask() const override; |
- virtual void GetHitTestMask(gfx::Path* mask) const override; |
+ bool CanFocus() override; |
+ void OnCaptureLost() override; |
+ void OnPaint(gfx::Canvas* canvas) override; |
+ void OnDeviceScaleFactorChanged(float device_scale_factor) override; |
+ void OnWindowDestroying(aura::Window* window) override; |
+ void OnWindowDestroyed(aura::Window* window) override; |
+ void OnWindowTargetVisibilityChanged(bool visible) override; |
+ bool HasHitTestMask() const override; |
+ void GetHitTestMask(gfx::Path* mask) const override; |
// Overridden from ui::EventHandler: |
- virtual void OnKeyEvent(ui::KeyEvent* event) override; |
- virtual void OnMouseEvent(ui::MouseEvent* event) override; |
- virtual void OnScrollEvent(ui::ScrollEvent* event) override; |
- virtual void OnGestureEvent(ui::GestureEvent* event) override; |
+ void OnKeyEvent(ui::KeyEvent* event) override; |
+ void OnMouseEvent(ui::MouseEvent* event) override; |
+ void OnScrollEvent(ui::ScrollEvent* event) override; |
+ void OnGestureEvent(ui::GestureEvent* event) override; |
// Overridden from aura::client::ActivationDelegate: |
- virtual bool ShouldActivate() const override; |
+ bool ShouldActivate() const override; |
// Overridden from aura::client::ActivationChangeObserver: |
- virtual void OnWindowActivated(aura::Window* gained_active, |
- aura::Window* lost_active) override; |
+ void OnWindowActivated(aura::Window* gained_active, |
+ aura::Window* lost_active) override; |
// Overridden from aura::client::FocusChangeObserver: |
- virtual void OnWindowFocused(aura::Window* gained_focus, |
- aura::Window* lost_focus) override; |
+ void OnWindowFocused(aura::Window* gained_focus, |
+ aura::Window* lost_focus) override; |
// Overridden from views::internal::InputMethodDelegate: |
- virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) override; |
+ void DispatchKeyEventPostIME(const ui::KeyEvent& key) override; |
// Overridden from aura::client::DragDropDelegate: |
- virtual void OnDragEntered(const ui::DropTargetEvent& event) override; |
- virtual int OnDragUpdated(const ui::DropTargetEvent& event) override; |
- virtual void OnDragExited() override; |
- virtual int OnPerformDrop(const ui::DropTargetEvent& event) override; |
+ void OnDragEntered(const ui::DropTargetEvent& event) override; |
+ int OnDragUpdated(const ui::DropTargetEvent& event) override; |
+ void OnDragExited() override; |
+ int OnPerformDrop(const ui::DropTargetEvent& event) override; |
// Overridden from aura::WindowTreeHostObserver: |
- virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) override; |
- virtual void OnHostResized(const aura::WindowTreeHost* host) override; |
- virtual void OnHostMoved(const aura::WindowTreeHost* host, |
- const gfx::Point& new_origin) override; |
+ void OnHostCloseRequested(const aura::WindowTreeHost* host) override; |
+ void OnHostResized(const aura::WindowTreeHost* host) override; |
+ void OnHostMoved(const aura::WindowTreeHost* host, |
+ const gfx::Point& new_origin) override; |
private: |
friend class FocusManagerEventHandler; |