diff options
Diffstat (limited to 'ui/views/examples')
36 files changed, 105 insertions, 105 deletions
diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc index 49a60e5..907611a 100644 --- a/ui/views/examples/bubble_example.cc +++ b/ui/views/examples/bubble_example.cc @@ -54,7 +54,7 @@ class ExampleBubble : public BubbleDelegateView { : BubbleDelegateView(anchor, arrow) {} protected: - virtual void Init() OVERRIDE { + virtual void Init() override { SetLayoutManager(new BoxLayout(BoxLayout::kVertical, 50, 50, 0)); AddChildView(new Label(GetArrowName(arrow()))); } diff --git a/ui/views/examples/bubble_example.h b/ui/views/examples/bubble_example.h index d9ad66d..eb5625c 100644 --- a/ui/views/examples/bubble_example.h +++ b/ui/views/examples/bubble_example.h @@ -19,11 +19,11 @@ class VIEWS_EXAMPLES_EXPORT BubbleExample : public ExampleBase, virtual ~BubbleExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; Button* no_shadow_; Button* big_shadow_; diff --git a/ui/views/examples/button_example.h b/ui/views/examples/button_example.h index 4e01a8a..8fc2c60 100644 --- a/ui/views/examples/button_example.h +++ b/ui/views/examples/button_example.h @@ -24,13 +24,13 @@ class VIEWS_EXAMPLES_EXPORT ButtonExample : public ExampleBase, virtual ~ButtonExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: void LabelButtonPressed(const ui::Event& event); // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // Example buttons. LabelButton* label_button_; diff --git a/ui/views/examples/checkbox_example.h b/ui/views/examples/checkbox_example.h index a5a8964..d95f1f4 100644 --- a/ui/views/examples/checkbox_example.h +++ b/ui/views/examples/checkbox_example.h @@ -22,11 +22,11 @@ class VIEWS_EXAMPLES_EXPORT CheckboxExample : public ExampleBase, virtual ~CheckboxExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // The only control in this test. Checkbox* button_; diff --git a/ui/views/examples/combobox_example.h b/ui/views/examples/combobox_example.h index 89ccff2..3ea1c24 100644 --- a/ui/views/examples/combobox_example.h +++ b/ui/views/examples/combobox_example.h @@ -20,8 +20,8 @@ class VIEWS_EXAMPLES_EXPORT ComboboxModelExample : public ui::ComboboxModel { virtual ~ComboboxModelExample(); // ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: DISALLOW_COPY_AND_ASSIGN(ComboboxModelExample); @@ -34,11 +34,11 @@ class VIEWS_EXAMPLES_EXPORT ComboboxExample : public ExampleBase, virtual ~ComboboxExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ComboboxListener: - virtual void OnPerformAction(Combobox* combobox) OVERRIDE; + virtual void OnPerformAction(Combobox* combobox) override; ComboboxModelExample combobox_model_; Combobox* combobox_; diff --git a/ui/views/examples/double_split_view_example.cc b/ui/views/examples/double_split_view_example.cc index 8ff40df..dc794e6 100644 --- a/ui/views/examples/double_split_view_example.cc +++ b/ui/views/examples/double_split_view_example.cc @@ -22,7 +22,7 @@ class SplittedView : public View { void SetColor(SkColor from, SkColor to); // View: - virtual gfx::Size GetMinimumSize() const OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; private: DISALLOW_COPY_AND_ASSIGN(SplittedView); diff --git a/ui/views/examples/double_split_view_example.h b/ui/views/examples/double_split_view_example.h index fe37c79..c83b8cb 100644 --- a/ui/views/examples/double_split_view_example.h +++ b/ui/views/examples/double_split_view_example.h @@ -19,7 +19,7 @@ class VIEWS_EXAMPLES_EXPORT DoubleSplitViewExample : public ExampleBase { virtual ~DoubleSplitViewExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // The SingleSplitViews to be embedded. diff --git a/ui/views/examples/example_base.cc b/ui/views/examples/example_base.cc index a06fc1d..bb216f9 100644 --- a/ui/views/examples/example_base.cc +++ b/ui/views/examples/example_base.cc @@ -29,7 +29,7 @@ class ContainerView : public View { private: // View: virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE { + const ViewHierarchyChangedDetails& details) override { View::ViewHierarchyChanged(details); // We're not using child == this because a Widget may not be // available when this is added to the hierarchy. diff --git a/ui/views/examples/example_combobox_model.h b/ui/views/examples/example_combobox_model.h index 3b23332..4988c60 100644 --- a/ui/views/examples/example_combobox_model.h +++ b/ui/views/examples/example_combobox_model.h @@ -17,8 +17,8 @@ class ExampleComboboxModel : public ui::ComboboxModel { virtual ~ExampleComboboxModel(); // ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: const char** strings_; diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc index 596cb75..040fcdc 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); diff --git a/ui/views/examples/label_example.cc b/ui/views/examples/label_example.cc index 178b62b..89e3223 100644 --- a/ui/views/examples/label_example.cc +++ b/ui/views/examples/label_example.cc @@ -37,7 +37,7 @@ class PreferredSizeLabel : public Label { virtual ~PreferredSizeLabel() {} // Label: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(50, Label::GetPreferredSize().height()); } diff --git a/ui/views/examples/label_example.h b/ui/views/examples/label_example.h index ea6cd94..f597742 100644 --- a/ui/views/examples/label_example.h +++ b/ui/views/examples/label_example.h @@ -30,17 +30,17 @@ class VIEWS_EXAMPLES_EXPORT LabelExample : public ExampleBase, virtual ~LabelExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; // ButtonListener: - virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* button, const ui::Event& event) override; // ComboboxListener: - virtual void OnPerformAction(Combobox* combobox) OVERRIDE; + virtual void OnPerformAction(Combobox* combobox) override; // TextfieldController: virtual void ContentsChanged(Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; private: // Add a customizable label and various controls to modify its presentation. diff --git a/ui/views/examples/link_example.h b/ui/views/examples/link_example.h index fd6e924..fa6bb57 100644 --- a/ui/views/examples/link_example.h +++ b/ui/views/examples/link_example.h @@ -19,11 +19,11 @@ class VIEWS_EXAMPLES_EXPORT LinkExample : public ExampleBase, virtual ~LinkExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // LinkListener: - virtual void LinkClicked(Link* source, int event_flags) OVERRIDE; + virtual void LinkClicked(Link* source, int event_flags) override; Link* link_; diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc index bc8845e..1b95457c 100644 --- a/ui/views/examples/menu_example.cc +++ b/ui/views/examples/menu_example.cc @@ -28,12 +28,12 @@ class ExampleMenuModel : public ui::SimpleMenuModel, ExampleMenuModel(); // ui::SimpleMenuModel::Delegate: - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; private: enum GroupID { @@ -66,7 +66,7 @@ class ExampleMenuButton : public MenuButton, public MenuButtonListener { private: // MenuButtonListener: virtual void OnMenuButtonClicked(View* source, - const gfx::Point& point) OVERRIDE; + const gfx::Point& point) override; ui::SimpleMenuModel* GetMenuModel(); diff --git a/ui/views/examples/menu_example.h b/ui/views/examples/menu_example.h index 3ed5d37..af370b3 100644 --- a/ui/views/examples/menu_example.h +++ b/ui/views/examples/menu_example.h @@ -19,7 +19,7 @@ class VIEWS_EXAMPLES_EXPORT MenuExample : public ExampleBase { virtual ~MenuExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: DISALLOW_COPY_AND_ASSIGN(MenuExample); diff --git a/ui/views/examples/message_box_example.h b/ui/views/examples/message_box_example.h index 692ae22..fe3ba67 100644 --- a/ui/views/examples/message_box_example.h +++ b/ui/views/examples/message_box_example.h @@ -24,11 +24,11 @@ class VIEWS_EXAMPLES_EXPORT MessageBoxExample : public ExampleBase, virtual ~MessageBoxExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // The MessageBoxView to be tested. MessageBoxView* message_box_view_; diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc index 8c86d9e2..d2d69cce 100644 --- a/ui/views/examples/multiline_example.cc +++ b/ui/views/examples/multiline_example.cc @@ -35,7 +35,7 @@ class PreferredSizeLabel : public Label { virtual ~PreferredSizeLabel() {} // Label: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(50, Label::GetPreferredSize().height()); } @@ -55,12 +55,12 @@ class MultilineExample::RenderTextView : public View { SetBorder(Border::CreateSolidBorder(2, SK_ColorGRAY)); } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { View::OnPaint(canvas); render_text_->Draw(canvas); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { // Turn off multiline mode to get the single-line text size, which is the // preferred size for this view. render_text_->SetMultiline(false); @@ -71,7 +71,7 @@ class MultilineExample::RenderTextView : public View { return size; } - virtual int GetHeightForWidth(int w) const OVERRIDE { + virtual int GetHeightForWidth(int w) const override { // TODO(ckocagil): Why does this happen? if (w == 0) return View::GetHeightForWidth(w); @@ -104,7 +104,7 @@ class MultilineExample::RenderTextView : public View { } private: - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE { + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override { gfx::Rect bounds = GetLocalBounds(); bounds.Inset(GetInsets()); render_text_->SetDisplayRect(bounds); diff --git a/ui/views/examples/multiline_example.h b/ui/views/examples/multiline_example.h index 94f4770..8b0888c 100644 --- a/ui/views/examples/multiline_example.h +++ b/ui/views/examples/multiline_example.h @@ -26,17 +26,17 @@ class VIEWS_EXAMPLES_EXPORT MultilineExample : public ExampleBase, virtual ~MultilineExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; private: class RenderTextView; // TextfieldController: virtual void ContentsChanged(Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; RenderTextView* render_text_view_; Label* label_; diff --git a/ui/views/examples/progress_bar_example.h b/ui/views/examples/progress_bar_example.h index 8533b7a..c3291d1 100644 --- a/ui/views/examples/progress_bar_example.h +++ b/ui/views/examples/progress_bar_example.h @@ -21,11 +21,11 @@ class VIEWS_EXAMPLES_EXPORT ProgressBarExample : public ExampleBase, virtual ~ProgressBarExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* button, const ui::Event& event) override; Button* minus_button_; Button* plus_button_; diff --git a/ui/views/examples/radio_button_example.h b/ui/views/examples/radio_button_example.h index cc14522..844e315 100644 --- a/ui/views/examples/radio_button_example.h +++ b/ui/views/examples/radio_button_example.h @@ -25,11 +25,11 @@ class VIEWS_EXAMPLES_EXPORT RadioButtonExample : public ExampleBase, virtual ~RadioButtonExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // Group of 3 radio buttons. RadioButton* radio_buttons_[3]; diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc index 127442f..f6abfce 100644 --- a/ui/views/examples/scroll_view_example.cc +++ b/ui/views/examples/scroll_view_example.cc @@ -27,7 +27,7 @@ class ScrollViewExample::ScrollableView : public View { AddChildView(new RadioButton(ASCIIToUTF16("Radio Button"), 0)); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(width(), height()); } @@ -41,7 +41,7 @@ class ScrollViewExample::ScrollableView : public View { view->SetBounds(0, y, size.width(), size.height()); } - virtual void Layout() OVERRIDE { + virtual void Layout() override { PlaceChildY(0, 0); PlaceChildY(1, height() / 2); SizeToPreferredSize(); diff --git a/ui/views/examples/scroll_view_example.h b/ui/views/examples/scroll_view_example.h index d850b01d..b3fd3bf 100644 --- a/ui/views/examples/scroll_view_example.h +++ b/ui/views/examples/scroll_view_example.h @@ -25,11 +25,11 @@ class VIEWS_EXAMPLES_EXPORT ScrollViewExample : public ExampleBase, virtual ~ScrollViewExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // Control buttons to change the size of scrollable and jump to // predefined position. diff --git a/ui/views/examples/single_split_view_example.cc b/ui/views/examples/single_split_view_example.cc index 7e390b5..21dd88e 100644 --- a/ui/views/examples/single_split_view_example.cc +++ b/ui/views/examples/single_split_view_example.cc @@ -22,9 +22,9 @@ class SplittedView : public View { private: // View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual gfx::Size GetMinimumSize() const override; + virtual void Layout() override; DISALLOW_COPY_AND_ASSIGN(SplittedView); }; diff --git a/ui/views/examples/single_split_view_example.h b/ui/views/examples/single_split_view_example.h index 603482c..b53c5c3 100644 --- a/ui/views/examples/single_split_view_example.h +++ b/ui/views/examples/single_split_view_example.h @@ -20,11 +20,11 @@ class VIEWS_EXAMPLES_EXPORT SingleSplitViewExample virtual ~SingleSplitViewExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // SingleSplitViewListener: - virtual bool SplitHandleMoved(SingleSplitView* sender) OVERRIDE; + virtual bool SplitHandleMoved(SingleSplitView* sender) override; SingleSplitView* single_split_view_; diff --git a/ui/views/examples/slider_example.h b/ui/views/examples/slider_example.h index 32950f9..b27099b 100644 --- a/ui/views/examples/slider_example.h +++ b/ui/views/examples/slider_example.h @@ -21,14 +21,14 @@ class VIEWS_EXAMPLES_EXPORT SliderExample : public ExampleBase, virtual ~SliderExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // SliderListener: virtual void SliderValueChanged(Slider* sender, float value, float old_value, - SliderChangeReason reason) OVERRIDE; + SliderChangeReason reason) override; Slider* slider_; Label* label_; diff --git a/ui/views/examples/tabbed_pane_example.h b/ui/views/examples/tabbed_pane_example.h index f23f6b3..a211a75 100644 --- a/ui/views/examples/tabbed_pane_example.h +++ b/ui/views/examples/tabbed_pane_example.h @@ -26,14 +26,14 @@ class VIEWS_EXAMPLES_EXPORT TabbedPaneExample : public ExampleBase, virtual ~TabbedPaneExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // TabbedPaneListener: - virtual void TabSelectedAt(int index) OVERRIDE; + virtual void TabSelectedAt(int index) override; // Print the status of the tab in the status area. void PrintStatus(); diff --git a/ui/views/examples/table_example.h b/ui/views/examples/table_example.h index 06ac3c0..5f51316 100644 --- a/ui/views/examples/table_example.h +++ b/ui/views/examples/table_example.h @@ -36,25 +36,25 @@ class VIEWS_EXAMPLES_EXPORT TableExample : public ExampleBase, virtual ~TableExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; // ui::TableModel: - virtual int RowCount() OVERRIDE; - virtual base::string16 GetText(int row, int column_id) OVERRIDE; - virtual gfx::ImageSkia GetIcon(int row) OVERRIDE; - virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE; + virtual int RowCount() override; + virtual base::string16 GetText(int row, int column_id) override; + virtual gfx::ImageSkia GetIcon(int row) override; + virtual void SetObserver(ui::TableModelObserver* observer) override; // TableGrouper: - virtual void GetGroupRange(int model_index, GroupRange* range) OVERRIDE; + virtual void GetGroupRange(int model_index, GroupRange* range) override; // TableViewObserver: - virtual void OnSelectionChanged() OVERRIDE; - virtual void OnDoubleClick() OVERRIDE; - virtual void OnMiddleClick() OVERRIDE; - virtual void OnKeyDown(ui::KeyboardCode virtual_keycode) OVERRIDE; + virtual void OnSelectionChanged() override; + virtual void OnDoubleClick() override; + virtual void OnMiddleClick() override; + virtual void OnKeyDown(ui::KeyboardCode virtual_keycode) override; // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; private: // The table to be tested. diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc index 3145cfc..4dcf113 100644 --- a/ui/views/examples/text_example.cc +++ b/ui/views/examples/text_example.cc @@ -69,7 +69,7 @@ class TextExample::TextExampleView : public View { elide_(gfx::NO_ELIDE) { } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { View::OnPaint(canvas); const gfx::Rect bounds = GetContentsBounds(); const SkColor color = SK_ColorDKGRAY; diff --git a/ui/views/examples/text_example.h b/ui/views/examples/text_example.h index 18ebaab..dd4bffc 100644 --- a/ui/views/examples/text_example.h +++ b/ui/views/examples/text_example.h @@ -27,7 +27,7 @@ class VIEWS_EXAMPLES_EXPORT TextExample : public ExampleBase, virtual ~TextExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // Creates and adds a check box to the layout. @@ -40,10 +40,10 @@ class VIEWS_EXAMPLES_EXPORT TextExample : public ExampleBase, int count); // ButtonListener: - virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* button, const ui::Event& event) override; // ComboboxListener: - virtual void OnPerformAction(Combobox* combobox) OVERRIDE; + virtual void OnPerformAction(Combobox* combobox) override; class TextExampleView; // The content of the scroll view. diff --git a/ui/views/examples/textfield_example.h b/ui/views/examples/textfield_example.h index db5e199..31aaaa9 100644 --- a/ui/views/examples/textfield_example.h +++ b/ui/views/examples/textfield_example.h @@ -27,19 +27,19 @@ class VIEWS_EXAMPLES_EXPORT TextfieldExample : public ExampleBase, virtual ~TextfieldExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // TextfieldController: virtual void ContentsChanged(Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; virtual bool HandleKeyEvent(Textfield* sender, - const ui::KeyEvent& key_event) OVERRIDE; + const ui::KeyEvent& key_event) override; virtual bool HandleMouseEvent(Textfield* sender, - const ui::MouseEvent& mouse_event) OVERRIDE; + const ui::MouseEvent& mouse_event) override; // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // Textfields for name and password. Textfield* name_; diff --git a/ui/views/examples/throbber_example.cc b/ui/views/examples/throbber_example.cc index 7bd18a2..51bbf3d 100644 --- a/ui/views/examples/throbber_example.cc +++ b/ui/views/examples/throbber_example.cc @@ -25,11 +25,11 @@ class ThrobberView : public View { throbber_->Start(); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(width(), height()); } - virtual void Layout() OVERRIDE { + virtual void Layout() override { View* child = child_at(0); gfx::Size ps = child->GetPreferredSize(); child->SetBounds((width() - ps.width()) / 2, diff --git a/ui/views/examples/throbber_example.h b/ui/views/examples/throbber_example.h index 3c4f9c0..dcac287 100644 --- a/ui/views/examples/throbber_example.h +++ b/ui/views/examples/throbber_example.h @@ -17,7 +17,7 @@ class VIEWS_EXAMPLES_EXPORT ThrobberExample : public ExampleBase { virtual ~ThrobberExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: DISALLOW_COPY_AND_ASSIGN(ThrobberExample); diff --git a/ui/views/examples/tree_view_example.h b/ui/views/examples/tree_view_example.h index 55af17f..4678b2a 100644 --- a/ui/views/examples/tree_view_example.h +++ b/ui/views/examples/tree_view_example.h @@ -31,7 +31,7 @@ class VIEWS_EXAMPLES_EXPORT TreeViewExample virtual ~TreeViewExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // IDs used by the context menu. @@ -48,24 +48,24 @@ class VIEWS_EXAMPLES_EXPORT TreeViewExample bool IsCommandIdEnabled(int command_id); // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; // TreeViewController: - virtual void OnTreeViewSelectionChanged(TreeView* tree_view) OVERRIDE; - virtual bool CanEdit(TreeView* tree_view, ui::TreeModelNode* node) OVERRIDE; + virtual void OnTreeViewSelectionChanged(TreeView* tree_view) override; + virtual bool CanEdit(TreeView* tree_view, ui::TreeModelNode* node) override; // ContextMenuController: virtual void ShowContextMenuForView(View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; // SimpleMenuModel::Delegate: - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; // The tree view to be tested. TreeView* tree_view_; diff --git a/ui/views/examples/webview_example.h b/ui/views/examples/webview_example.h index 3e35fe9..e55aced 100644 --- a/ui/views/examples/webview_example.h +++ b/ui/views/examples/webview_example.h @@ -23,7 +23,7 @@ class WebViewExample : public ExampleBase { virtual ~WebViewExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: WebView* webview_; diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc index 1109a5a..2c061b7 100644 --- a/ui/views/examples/widget_example.cc +++ b/ui/views/examples/widget_example.cc @@ -24,10 +24,10 @@ class DialogExample : public DialogDelegateView { public: DialogExample(); virtual ~DialogExample(); - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual View* CreateExtraView() OVERRIDE; - virtual View* CreateTitlebarExtraView() OVERRIDE; - virtual View* CreateFootnoteView() OVERRIDE; + virtual base::string16 GetWindowTitle() const override; + virtual View* CreateExtraView() override; + virtual View* CreateTitlebarExtraView() override; + virtual View* CreateFootnoteView() override; }; DialogExample::DialogExample() { diff --git a/ui/views/examples/widget_example.h b/ui/views/examples/widget_example.h index ff08d70..44e1840 100644 --- a/ui/views/examples/widget_example.h +++ b/ui/views/examples/widget_example.h @@ -23,7 +23,7 @@ class VIEWS_EXAMPLES_EXPORT WidgetExample : public ExampleBase, virtual ~WidgetExample(); // ExampleBase: - virtual void CreateExampleView(View* container) OVERRIDE; + virtual void CreateExampleView(View* container) override; private: // Button tags used to identify various commands. @@ -41,7 +41,7 @@ class VIEWS_EXAMPLES_EXPORT WidgetExample : public ExampleBase, void ShowWidget(View* sender, Widget::InitParams params); // ButtonListener: - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) override; DISALLOW_COPY_AND_ASSIGN(WidgetExample); }; |