| Index: ui/views/examples/examples_window.cc
|
| diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
|
| index 040fcdc741771befdae8a4367cb9898c801b064a..fb86183bbbf9d3399b9ef7e7f1ea43f1ac575fbe 100644
|
| --- a/ui/views/examples/examples_window.cc
|
| +++ b/ui/views/examples/examples_window.cc
|
| @@ -98,15 +98,15 @@ ScopedExamples GetExamplesToShow(ScopedExamples extra) {
|
| class ComboboxModelExampleList : public ui::ComboboxModel {
|
| public:
|
| ComboboxModelExampleList() {}
|
| - virtual ~ComboboxModelExampleList() {}
|
| + ~ComboboxModelExampleList() override {}
|
|
|
| void SetExamples(ScopedExamples examples) {
|
| example_list_.swap(*examples);
|
| }
|
|
|
| // ui::ComboboxModel:
|
| - virtual int GetItemCount() const override { return example_list_.size(); }
|
| - virtual base::string16 GetItemAt(int index) override {
|
| + int GetItemCount() const override { return example_list_.size(); }
|
| + base::string16 GetItemAt(int index) override {
|
| return base::UTF8ToUTF16(example_list_[index]->example_title());
|
| }
|
|
|
| @@ -157,7 +157,7 @@ class ExamplesWindowContents : public WidgetDelegateView,
|
| layout->AddPaddingRow(0, 5);
|
| }
|
|
|
| - virtual ~ExamplesWindowContents() {
|
| + ~ExamplesWindowContents() override {
|
| // Delete |combobox_| first as it references |combobox_model_|.
|
| delete combobox_;
|
| combobox_ = NULL;
|
| @@ -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 {
|
| + bool CanResize() const override { return true; }
|
| + bool CanMaximize() const override { return true; }
|
| + bool CanMinimize() const override { return true; }
|
| + base::string16 GetWindowTitle() const override {
|
| return base::ASCIIToUTF16("Views Examples");
|
| }
|
| - virtual View* GetContentsView() override { return this; }
|
| - virtual void WindowClosing() override {
|
| + View* GetContentsView() override { return this; }
|
| + void WindowClosing() override {
|
| instance_ = NULL;
|
| if (operation_ == QUIT_ON_CLOSE)
|
| base::MessageLoopForUI::current()->Quit();
|
| }
|
|
|
| // ComboboxListener:
|
| - virtual void OnPerformAction(Combobox* combobox) override {
|
| + void OnPerformAction(Combobox* combobox) override {
|
| DCHECK_EQ(combobox, combobox_);
|
| DCHECK(combobox->selected_index() < combobox_model_.GetItemCount());
|
| example_shown_->RemoveAllChildViews(false);
|
|
|