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

Unified Diff: ui/views/examples/examples_window.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/examples/example_combobox_model.h ('k') | ui/views/examples/label_example.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/examples_window.cc
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index 596cb75b981bd9bbd9cb5439a8ead89fa3321c4d..040fcdc741771befdae8a4367cb9898c801b064a 100644
--- a/ui/views/examples/examples_window.cc
+++ b/ui/views/examples/examples_window.cc
@@ -105,8 +105,8 @@ class ComboboxModelExampleList : public ui::ComboboxModel {
}
// ui::ComboboxModel:
- virtual int GetItemCount() const OVERRIDE { return example_list_.size(); }
- virtual base::string16 GetItemAt(int index) OVERRIDE {
+ virtual int GetItemCount() const override { return example_list_.size(); }
+ virtual base::string16 GetItemAt(int index) override {
return base::UTF8ToUTF16(example_list_[index]->example_title());
}
@@ -172,21 +172,21 @@ class ExamplesWindowContents : public WidgetDelegateView,
private:
// WidgetDelegateView:
- virtual bool CanResize() const OVERRIDE { return true; }
- virtual bool CanMaximize() const OVERRIDE { return true; }
- virtual bool CanMinimize() const OVERRIDE { return true; }
- virtual base::string16 GetWindowTitle() const OVERRIDE {
+ virtual bool CanResize() const override { return true; }
+ virtual bool CanMaximize() const override { return true; }
+ virtual bool CanMinimize() const override { return true; }
+ virtual base::string16 GetWindowTitle() const override {
return base::ASCIIToUTF16("Views Examples");
}
- virtual View* GetContentsView() OVERRIDE { return this; }
- virtual void WindowClosing() OVERRIDE {
+ virtual View* GetContentsView() override { return this; }
+ virtual void WindowClosing() override {
instance_ = NULL;
if (operation_ == QUIT_ON_CLOSE)
base::MessageLoopForUI::current()->Quit();
}
// ComboboxListener:
- virtual void OnPerformAction(Combobox* combobox) OVERRIDE {
+ virtual void OnPerformAction(Combobox* combobox) override {
DCHECK_EQ(combobox, combobox_);
DCHECK(combobox->selected_index() < combobox_model_.GetItemCount());
example_shown_->RemoveAllChildViews(false);
« no previous file with comments | « ui/views/examples/example_combobox_model.h ('k') | ui/views/examples/label_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698