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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/views/widget/native_widget_aura.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/views/widget/desktop_aura/x11_window_event_filter.h ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "ui/aura/client/focus_change_observer.h" 10 #include "ui/aura/client/focus_change_observer.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 public: 44 public:
45 explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate); 45 explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
46 46
47 // Called internally by NativeWidgetAura and DesktopNativeWidgetAura to 47 // Called internally by NativeWidgetAura and DesktopNativeWidgetAura to
48 // associate |native_widget| with |window|. 48 // associate |native_widget| with |window|.
49 static void RegisterNativeWidgetForWindow( 49 static void RegisterNativeWidgetForWindow(
50 internal::NativeWidgetPrivate* native_widget, 50 internal::NativeWidgetPrivate* native_widget,
51 aura::Window* window); 51 aura::Window* window);
52 52
53 // Overridden from internal::NativeWidgetPrivate: 53 // Overridden from internal::NativeWidgetPrivate:
54 virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE; 54 virtual void InitNativeWidget(const Widget::InitParams& params) override;
55 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE; 55 virtual NonClientFrameView* CreateNonClientFrameView() override;
56 virtual bool ShouldUseNativeFrame() const OVERRIDE; 56 virtual bool ShouldUseNativeFrame() const override;
57 virtual bool ShouldWindowContentsBeTransparent() const OVERRIDE; 57 virtual bool ShouldWindowContentsBeTransparent() const override;
58 virtual void FrameTypeChanged() OVERRIDE; 58 virtual void FrameTypeChanged() override;
59 virtual Widget* GetWidget() OVERRIDE; 59 virtual Widget* GetWidget() override;
60 virtual const Widget* GetWidget() const OVERRIDE; 60 virtual const Widget* GetWidget() const override;
61 virtual gfx::NativeView GetNativeView() const OVERRIDE; 61 virtual gfx::NativeView GetNativeView() const override;
62 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; 62 virtual gfx::NativeWindow GetNativeWindow() const override;
63 virtual Widget* GetTopLevelWidget() OVERRIDE; 63 virtual Widget* GetTopLevelWidget() override;
64 virtual const ui::Compositor* GetCompositor() const OVERRIDE; 64 virtual const ui::Compositor* GetCompositor() const override;
65 virtual ui::Compositor* GetCompositor() OVERRIDE; 65 virtual ui::Compositor* GetCompositor() override;
66 virtual ui::Layer* GetLayer() OVERRIDE; 66 virtual ui::Layer* GetLayer() override;
67 virtual void ReorderNativeViews() OVERRIDE; 67 virtual void ReorderNativeViews() override;
68 virtual void ViewRemoved(View* view) OVERRIDE; 68 virtual void ViewRemoved(View* view) override;
69 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE; 69 virtual void SetNativeWindowProperty(const char* name, void* value) override;
70 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE; 70 virtual void* GetNativeWindowProperty(const char* name) const override;
71 virtual TooltipManager* GetTooltipManager() const OVERRIDE; 71 virtual TooltipManager* GetTooltipManager() const override;
72 virtual void SetCapture() OVERRIDE; 72 virtual void SetCapture() override;
73 virtual void ReleaseCapture() OVERRIDE; 73 virtual void ReleaseCapture() override;
74 virtual bool HasCapture() const OVERRIDE; 74 virtual bool HasCapture() const override;
75 virtual InputMethod* CreateInputMethod() OVERRIDE; 75 virtual InputMethod* CreateInputMethod() override;
76 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE; 76 virtual internal::InputMethodDelegate* GetInputMethodDelegate() override;
77 virtual ui::InputMethod* GetHostInputMethod() OVERRIDE; 77 virtual ui::InputMethod* GetHostInputMethod() override;
78 virtual void CenterWindow(const gfx::Size& size) OVERRIDE; 78 virtual void CenterWindow(const gfx::Size& size) override;
79 virtual void GetWindowPlacement( 79 virtual void GetWindowPlacement(
80 gfx::Rect* bounds, 80 gfx::Rect* bounds,
81 ui::WindowShowState* maximized) const OVERRIDE; 81 ui::WindowShowState* maximized) const override;
82 virtual bool SetWindowTitle(const base::string16& title) OVERRIDE; 82 virtual bool SetWindowTitle(const base::string16& title) override;
83 virtual void SetWindowIcons(const gfx::ImageSkia& window_icon, 83 virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,
84 const gfx::ImageSkia& app_icon) OVERRIDE; 84 const gfx::ImageSkia& app_icon) override;
85 virtual void InitModalType(ui::ModalType modal_type) OVERRIDE; 85 virtual void InitModalType(ui::ModalType modal_type) override;
86 virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE; 86 virtual gfx::Rect GetWindowBoundsInScreen() const override;
87 virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE; 87 virtual gfx::Rect GetClientAreaBoundsInScreen() const override;
88 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 88 virtual gfx::Rect GetRestoredBounds() const override;
89 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 89 virtual void SetBounds(const gfx::Rect& bounds) override;
90 virtual void SetSize(const gfx::Size& size) OVERRIDE; 90 virtual void SetSize(const gfx::Size& size) override;
91 virtual void StackAbove(gfx::NativeView native_view) OVERRIDE; 91 virtual void StackAbove(gfx::NativeView native_view) override;
92 virtual void StackAtTop() OVERRIDE; 92 virtual void StackAtTop() override;
93 virtual void StackBelow(gfx::NativeView native_view) OVERRIDE; 93 virtual void StackBelow(gfx::NativeView native_view) override;
94 virtual void SetShape(gfx::NativeRegion shape) OVERRIDE; 94 virtual void SetShape(gfx::NativeRegion shape) override;
95 virtual void Close() OVERRIDE; 95 virtual void Close() override;
96 virtual void CloseNow() OVERRIDE; 96 virtual void CloseNow() override;
97 virtual void Show() OVERRIDE; 97 virtual void Show() override;
98 virtual void Hide() OVERRIDE; 98 virtual void Hide() override;
99 virtual void ShowMaximizedWithBounds( 99 virtual void ShowMaximizedWithBounds(
100 const gfx::Rect& restored_bounds) OVERRIDE; 100 const gfx::Rect& restored_bounds) override;
101 virtual void ShowWithWindowState(ui::WindowShowState state) OVERRIDE; 101 virtual void ShowWithWindowState(ui::WindowShowState state) override;
102 virtual bool IsVisible() const OVERRIDE; 102 virtual bool IsVisible() const override;
103 virtual void Activate() OVERRIDE; 103 virtual void Activate() override;
104 virtual void Deactivate() OVERRIDE; 104 virtual void Deactivate() override;
105 virtual bool IsActive() const OVERRIDE; 105 virtual bool IsActive() const override;
106 virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; 106 virtual void SetAlwaysOnTop(bool always_on_top) override;
107 virtual bool IsAlwaysOnTop() const OVERRIDE; 107 virtual bool IsAlwaysOnTop() const override;
108 virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE; 108 virtual void SetVisibleOnAllWorkspaces(bool always_visible) override;
109 virtual void Maximize() OVERRIDE; 109 virtual void Maximize() override;
110 virtual void Minimize() OVERRIDE; 110 virtual void Minimize() override;
111 virtual bool IsMaximized() const OVERRIDE; 111 virtual bool IsMaximized() const override;
112 virtual bool IsMinimized() const OVERRIDE; 112 virtual bool IsMinimized() const override;
113 virtual void Restore() OVERRIDE; 113 virtual void Restore() override;
114 virtual void SetFullscreen(bool fullscreen) OVERRIDE; 114 virtual void SetFullscreen(bool fullscreen) override;
115 virtual bool IsFullscreen() const OVERRIDE; 115 virtual bool IsFullscreen() const override;
116 virtual void SetOpacity(unsigned char opacity) OVERRIDE; 116 virtual void SetOpacity(unsigned char opacity) override;
117 virtual void SetUseDragFrame(bool use_drag_frame) OVERRIDE; 117 virtual void SetUseDragFrame(bool use_drag_frame) override;
118 virtual void FlashFrame(bool flash_frame) OVERRIDE; 118 virtual void FlashFrame(bool flash_frame) override;
119 virtual void RunShellDrag(View* view, 119 virtual void RunShellDrag(View* view,
120 const ui::OSExchangeData& data, 120 const ui::OSExchangeData& data,
121 const gfx::Point& location, 121 const gfx::Point& location,
122 int operation, 122 int operation,
123 ui::DragDropTypes::DragEventSource source) OVERRIDE; 123 ui::DragDropTypes::DragEventSource source) override;
124 virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; 124 virtual void SchedulePaintInRect(const gfx::Rect& rect) override;
125 virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE; 125 virtual void SetCursor(gfx::NativeCursor cursor) override;
126 virtual bool IsMouseEventsEnabled() const OVERRIDE; 126 virtual bool IsMouseEventsEnabled() const override;
127 virtual void ClearNativeFocus() OVERRIDE; 127 virtual void ClearNativeFocus() override;
128 virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE; 128 virtual gfx::Rect GetWorkAreaBoundsInScreen() const override;
129 virtual Widget::MoveLoopResult RunMoveLoop( 129 virtual Widget::MoveLoopResult RunMoveLoop(
130 const gfx::Vector2d& drag_offset, 130 const gfx::Vector2d& drag_offset,
131 Widget::MoveLoopSource source, 131 Widget::MoveLoopSource source,
132 Widget::MoveLoopEscapeBehavior escape_behavior) OVERRIDE; 132 Widget::MoveLoopEscapeBehavior escape_behavior) override;
133 virtual void EndMoveLoop() OVERRIDE; 133 virtual void EndMoveLoop() override;
134 virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE; 134 virtual void SetVisibilityChangedAnimationsEnabled(bool value) override;
135 virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE; 135 virtual ui::NativeTheme* GetNativeTheme() const override;
136 virtual void OnRootViewLayout() OVERRIDE; 136 virtual void OnRootViewLayout() override;
137 virtual bool IsTranslucentWindowOpacitySupported() const OVERRIDE; 137 virtual bool IsTranslucentWindowOpacitySupported() const override;
138 virtual void OnSizeConstraintsChanged() OVERRIDE; 138 virtual void OnSizeConstraintsChanged() override;
139 virtual void RepostNativeEvent(gfx::NativeEvent native_event) OVERRIDE; 139 virtual void RepostNativeEvent(gfx::NativeEvent native_event) override;
140 140
141 // Overridden from views::InputMethodDelegate: 141 // Overridden from views::InputMethodDelegate:
142 virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE; 142 virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) override;
143 143
144 // Overridden from aura::WindowDelegate: 144 // Overridden from aura::WindowDelegate:
145 virtual gfx::Size GetMinimumSize() const OVERRIDE; 145 virtual gfx::Size GetMinimumSize() const override;
146 virtual gfx::Size GetMaximumSize() const OVERRIDE; 146 virtual gfx::Size GetMaximumSize() const override;
147 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 147 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
148 const gfx::Rect& new_bounds) OVERRIDE; 148 const gfx::Rect& new_bounds) override;
149 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; 149 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override;
150 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; 150 virtual int GetNonClientComponent(const gfx::Point& point) const override;
151 virtual bool ShouldDescendIntoChildForEventHandling( 151 virtual bool ShouldDescendIntoChildForEventHandling(
152 aura::Window* child, 152 aura::Window* child,
153 const gfx::Point& location) OVERRIDE; 153 const gfx::Point& location) override;
154 virtual bool CanFocus() OVERRIDE; 154 virtual bool CanFocus() override;
155 virtual void OnCaptureLost() OVERRIDE; 155 virtual void OnCaptureLost() override;
156 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 156 virtual void OnPaint(gfx::Canvas* canvas) override;
157 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 157 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override;
158 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 158 virtual void OnWindowDestroying(aura::Window* window) override;
159 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 159 virtual void OnWindowDestroyed(aura::Window* window) override;
160 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 160 virtual void OnWindowTargetVisibilityChanged(bool visible) override;
161 virtual bool HasHitTestMask() const OVERRIDE; 161 virtual bool HasHitTestMask() const override;
162 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 162 virtual void GetHitTestMask(gfx::Path* mask) const override;
163 163
164 // Overridden from aura::WindowObserver: 164 // Overridden from aura::WindowObserver:
165 virtual void OnWindowPropertyChanged(aura::Window* window, 165 virtual void OnWindowPropertyChanged(aura::Window* window,
166 const void* key, 166 const void* key,
167 intptr_t old) OVERRIDE; 167 intptr_t old) override;
168 168
169 // Overridden from ui::EventHandler: 169 // Overridden from ui::EventHandler:
170 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 170 virtual void OnKeyEvent(ui::KeyEvent* event) override;
171 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 171 virtual void OnMouseEvent(ui::MouseEvent* event) override;
172 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 172 virtual void OnScrollEvent(ui::ScrollEvent* event) override;
173 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 173 virtual void OnGestureEvent(ui::GestureEvent* event) override;
174 174
175 // Overridden from aura::client::ActivationDelegate: 175 // Overridden from aura::client::ActivationDelegate:
176 virtual bool ShouldActivate() const OVERRIDE; 176 virtual bool ShouldActivate() const override;
177 177
178 // Overridden from aura::client::ActivationChangeObserver: 178 // Overridden from aura::client::ActivationChangeObserver:
179 virtual void OnWindowActivated(aura::Window* gained_active, 179 virtual void OnWindowActivated(aura::Window* gained_active,
180 aura::Window* lost_active) OVERRIDE; 180 aura::Window* lost_active) override;
181 181
182 // Overridden from aura::client::FocusChangeObserver: 182 // Overridden from aura::client::FocusChangeObserver:
183 virtual void OnWindowFocused(aura::Window* gained_focus, 183 virtual void OnWindowFocused(aura::Window* gained_focus,
184 aura::Window* lost_focus) OVERRIDE; 184 aura::Window* lost_focus) override;
185 185
186 // Overridden from aura::client::DragDropDelegate: 186 // Overridden from aura::client::DragDropDelegate:
187 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; 187 virtual void OnDragEntered(const ui::DropTargetEvent& event) override;
188 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; 188 virtual int OnDragUpdated(const ui::DropTargetEvent& event) override;
189 virtual void OnDragExited() OVERRIDE; 189 virtual void OnDragExited() override;
190 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; 190 virtual int OnPerformDrop(const ui::DropTargetEvent& event) override;
191 191
192 protected: 192 protected:
193 virtual ~NativeWidgetAura(); 193 virtual ~NativeWidgetAura();
194 194
195 internal::NativeWidgetDelegate* delegate() { return delegate_; } 195 internal::NativeWidgetDelegate* delegate() { return delegate_; }
196 196
197 private: 197 private:
198 class ActiveWindowObserver; 198 class ActiveWindowObserver;
199 199
200 void SetInitialFocus(ui::WindowShowState show_state); 200 void SetInitialFocus(ui::WindowShowState show_state);
(...skipping 28 matching lines...) Expand all
229 // The following factory is used for calls to close the NativeWidgetAura 229 // The following factory is used for calls to close the NativeWidgetAura
230 // instance. 230 // instance.
231 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_; 231 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
232 232
233 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 233 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
234 }; 234 };
235 235
236 } // namespace views 236 } // namespace views
237 237
238 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 238 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/x11_window_event_filter.h ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698