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

Side by Side Diff: ui/views/widget/widget_delegate.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/widget.cc ('k') | ui/views/widget/widget_deletion_observer.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 (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_WIDGET_DELEGATE_H_ 5 #ifndef UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_
6 #define UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_ 6 #define UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 // A WidgetDelegate implementation that is-a View. Used to override GetWidget() 197 // A WidgetDelegate implementation that is-a View. Used to override GetWidget()
198 // to call View's GetWidget() for the common case where a WidgetDelegate 198 // to call View's GetWidget() for the common case where a WidgetDelegate
199 // implementation is-a View. Note that WidgetDelegateView is not owned by 199 // implementation is-a View. Note that WidgetDelegateView is not owned by
200 // view's hierarchy and is expected to be deleted on DeleteDelegate call. 200 // view's hierarchy and is expected to be deleted on DeleteDelegate call.
201 class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View { 201 class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View {
202 public: 202 public:
203 WidgetDelegateView(); 203 WidgetDelegateView();
204 virtual ~WidgetDelegateView(); 204 virtual ~WidgetDelegateView();
205 205
206 // Overridden from WidgetDelegate: 206 // Overridden from WidgetDelegate:
207 virtual void DeleteDelegate() OVERRIDE; 207 virtual void DeleteDelegate() override;
208 virtual Widget* GetWidget() OVERRIDE; 208 virtual Widget* GetWidget() override;
209 virtual const Widget* GetWidget() const OVERRIDE; 209 virtual const Widget* GetWidget() const override;
210 210
211 private: 211 private:
212 DISALLOW_COPY_AND_ASSIGN(WidgetDelegateView); 212 DISALLOW_COPY_AND_ASSIGN(WidgetDelegateView);
213 }; 213 };
214 214
215 } // namespace views 215 } // namespace views
216 216
217 #endif // UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_ 217 #endif // UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/views/widget/widget.cc ('k') | ui/views/widget/widget_deletion_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698