Commit f599cb1f authored by dcheng's avatar dcheng Committed by Commit bot

Standardize usage of virtual/override/final specifiers.

The Google C++ style guide states:

  Explicitly annotate overrides of virtual functions or virtual
  destructors with an override or (less frequently) final specifier.
  Older (pre-C++11) code will use the virtual keyword as an inferior
  alternative annotation. For clarity, use exactly one of override,
  final, or virtual when declaring an override.

To better conform to these guidelines, the following constructs have
been rewritten:

- if a base class has a virtual destructor, then:
    virtual ~Foo();                   ->  ~Foo() override;
- virtual void Foo() override;        ->  void Foo() override;
- virtual void Foo() override final;  ->  void Foo() final;

This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.

BUG=417463
R=sadrul@chromium.org

Review URL: https://codereview.chromium.org/684463003

Cr-Commit-Position: refs/heads/master@{#301483}
parent a0f10dd5
......@@ -54,7 +54,7 @@ class ExampleBubble : public BubbleDelegateView {
: BubbleDelegateView(anchor, arrow) {}
protected:
virtual void Init() override {
void Init() override {
SetLayoutManager(new BoxLayout(BoxLayout::kVertical, 50, 50, 0));
AddChildView(new Label(GetArrowName(arrow())));
}
......
......@@ -16,14 +16,14 @@ class VIEWS_EXAMPLES_EXPORT BubbleExample : public ExampleBase,
public ButtonListener {
public:
BubbleExample();
virtual ~BubbleExample();
~BubbleExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
void ButtonPressed(Button* sender, const ui::Event& event) override;
Button* no_shadow_;
Button* big_shadow_;
......
......@@ -21,16 +21,16 @@ class VIEWS_EXAMPLES_EXPORT ButtonExample : public ExampleBase,
public ButtonListener {
public:
ButtonExample();
virtual ~ButtonExample();
~ButtonExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
void LabelButtonPressed(const ui::Event& event);
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
void ButtonPressed(Button* sender, const ui::Event& event) override;
// Example buttons.
LabelButton* label_button_;
......
......@@ -19,14 +19,14 @@ class VIEWS_EXAMPLES_EXPORT CheckboxExample : public ExampleBase,
public ButtonListener {
public:
CheckboxExample();
virtual ~CheckboxExample();
~CheckboxExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
void ButtonPressed(Button* sender, const ui::Event& event) override;
// The only control in this test.
Checkbox* button_;
......
......@@ -17,11 +17,11 @@ namespace examples {
class VIEWS_EXAMPLES_EXPORT ComboboxModelExample : public ui::ComboboxModel {
public:
ComboboxModelExample();
virtual ~ComboboxModelExample();
~ComboboxModelExample() override;
// ui::ComboboxModel:
virtual int GetItemCount() const override;
virtual base::string16 GetItemAt(int index) override;
int GetItemCount() const override;
base::string16 GetItemAt(int index) override;
private:
DISALLOW_COPY_AND_ASSIGN(ComboboxModelExample);
......@@ -31,14 +31,14 @@ class VIEWS_EXAMPLES_EXPORT ComboboxExample : public ExampleBase,
public ComboboxListener {
public:
ComboboxExample();
virtual ~ComboboxExample();
~ComboboxExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// ComboboxListener:
virtual void OnPerformAction(Combobox* combobox) override;
void OnPerformAction(Combobox* combobox) override;
ComboboxModelExample combobox_model_;
Combobox* combobox_;
......
......@@ -17,12 +17,12 @@ namespace {
class SplittedView : public View {
public:
SplittedView();
virtual ~SplittedView();
~SplittedView() override;
void SetColor(SkColor from, SkColor to);
// View:
virtual gfx::Size GetMinimumSize() const override;
gfx::Size GetMinimumSize() const override;
private:
DISALLOW_COPY_AND_ASSIGN(SplittedView);
......
......@@ -16,10 +16,10 @@ namespace examples {
class VIEWS_EXAMPLES_EXPORT DoubleSplitViewExample : public ExampleBase {
public:
DoubleSplitViewExample();
virtual ~DoubleSplitViewExample();
~DoubleSplitViewExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// The SingleSplitViews to be embedded.
......
......@@ -28,7 +28,7 @@ class ContainerView : public View {
private:
// View:
virtual void ViewHierarchyChanged(
void ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) override {
View::ViewHierarchyChanged(details);
// We're not using child == this because a Widget may not be
......
......@@ -14,11 +14,11 @@ namespace examples {
class ExampleComboboxModel : public ui::ComboboxModel {
public:
ExampleComboboxModel(const char** strings, int count);
virtual ~ExampleComboboxModel();
~ExampleComboboxModel() override;
// ui::ComboboxModel:
virtual int GetItemCount() const override;
virtual base::string16 GetItemAt(int index) override;
int GetItemCount() const override;
base::string16 GetItemAt(int index) override;
private:
const char** strings_;
......
......@@ -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);
......
......@@ -34,10 +34,10 @@ class PreferredSizeLabel : public Label {
PreferredSizeLabel() : Label() {
SetBorder(Border::CreateSolidBorder(1, SK_ColorGRAY));
}
virtual ~PreferredSizeLabel() {}
~PreferredSizeLabel() override {}
// Label:
virtual gfx::Size GetPreferredSize() const override {
gfx::Size GetPreferredSize() const override {
return gfx::Size(50, Label::GetPreferredSize().height());
}
......
......@@ -27,19 +27,19 @@ class VIEWS_EXAMPLES_EXPORT LabelExample : public ExampleBase,
public TextfieldController {
public:
LabelExample();
virtual ~LabelExample();
~LabelExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
// ButtonListener:
virtual void ButtonPressed(Button* button, const ui::Event& event) override;
void ButtonPressed(Button* button, const ui::Event& event) override;
// ComboboxListener:
virtual void OnPerformAction(Combobox* combobox) override;
void OnPerformAction(Combobox* combobox) override;
// TextfieldController:
virtual void ContentsChanged(Textfield* sender,
void ContentsChanged(Textfield* sender,
const base::string16& new_contents) override;
private:
......
......@@ -16,14 +16,14 @@ class VIEWS_EXAMPLES_EXPORT LinkExample : public ExampleBase,
public LinkListener {
public:
LinkExample();
virtual ~LinkExample();
~LinkExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// LinkListener:
virtual void LinkClicked(Link* source, int event_flags) override;
void LinkClicked(Link* source, int event_flags) override;
Link* link_;
......
......@@ -28,12 +28,11 @@ 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 GetAcceleratorForCommandId(
int command_id,
bool IsCommandIdChecked(int command_id) const override;
bool IsCommandIdEnabled(int command_id) const override;
bool GetAcceleratorForCommandId(int command_id,
ui::Accelerator* accelerator) override;
virtual void ExecuteCommand(int command_id, int event_flags) override;
void ExecuteCommand(int command_id, int event_flags) override;
private:
enum GroupID {
......@@ -61,12 +60,11 @@ class ExampleMenuModel : public ui::SimpleMenuModel,
class ExampleMenuButton : public MenuButton, public MenuButtonListener {
public:
explicit ExampleMenuButton(const base::string16& test);
virtual ~ExampleMenuButton();
~ExampleMenuButton() override;
private:
// MenuButtonListener:
virtual void OnMenuButtonClicked(View* source,
const gfx::Point& point) override;
void OnMenuButtonClicked(View* source, const gfx::Point& point) override;
ui::SimpleMenuModel* GetMenuModel();
......
......@@ -16,10 +16,10 @@ namespace examples {
class VIEWS_EXAMPLES_EXPORT MenuExample : public ExampleBase {
public:
MenuExample();
virtual ~MenuExample();
~MenuExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
DISALLOW_COPY_AND_ASSIGN(MenuExample);
......
......@@ -21,14 +21,14 @@ class VIEWS_EXAMPLES_EXPORT MessageBoxExample : public ExampleBase,
public ButtonListener {
public:
MessageBoxExample();
virtual ~MessageBoxExample();
~MessageBoxExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
void ButtonPressed(Button* sender, const ui::Event& event) override;
// The MessageBoxView to be tested.
MessageBoxView* message_box_view_;
......
......@@ -32,10 +32,10 @@ gfx::Range ClampRange(gfx::Range range, size_t max) {
class PreferredSizeLabel : public Label {
public:
PreferredSizeLabel() : Label() {}
virtual ~PreferredSizeLabel() {}
~PreferredSizeLabel() override {}
// Label:
virtual gfx::Size GetPreferredSize() const override {
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 {
void OnPaint(gfx::Canvas* canvas) override {
View::OnPaint(canvas);
render_text_->Draw(canvas);
}
virtual gfx::Size GetPreferredSize() const override {
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 {
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 {
void OnBoundsChanged(const gfx::Rect& previous_bounds) override {
gfx::Rect bounds = GetLocalBounds();
bounds.Inset(GetInsets());
render_text_->SetDisplayRect(bounds);
......
......@@ -23,19 +23,19 @@ class VIEWS_EXAMPLES_EXPORT MultilineExample : public ExampleBase,
public ButtonListener {
public:
MultilineExample();
virtual ~MultilineExample();
~MultilineExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
void ButtonPressed(Button* sender, const ui::Event& event) override;
private:
class RenderTextView;
// TextfieldController:
virtual void ContentsChanged(Textfield* sender,
void ContentsChanged(Textfield* sender,
const base::string16& new_contents) override;
RenderTextView* render_text_view_;
......
......@@ -18,14 +18,14 @@ class VIEWS_EXAMPLES_EXPORT ProgressBarExample : public ExampleBase,
public ButtonListener {
public:
ProgressBarExample();
virtual ~ProgressBarExample();
~ProgressBarExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// ButtonListener:
virtual void ButtonPressed(Button* button, const ui::Event& event) override;
void ButtonPressed(Button* button, const ui::Event& event) override;
Button* minus_button_;
Button* plus_button_;
......
......@@ -22,14 +22,14 @@ class VIEWS_EXAMPLES_EXPORT RadioButtonExample : public ExampleBase,
public ButtonListener {
public:
RadioButtonExample();
virtual ~RadioButtonExample();
~RadioButtonExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
void ButtonPressed(Button* sender, const ui::Event& event) override;
// Group of 3 radio buttons.
RadioButton* radio_buttons_[3];
......
......@@ -27,7 +27,7 @@ class ScrollViewExample::ScrollableView : public View {
AddChildView(new RadioButton(ASCIIToUTF16("Radio Button"), 0));
}
virtual gfx::Size GetPreferredSize() const override {
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 {
void Layout() override {
PlaceChildY(0, 0);
PlaceChildY(1, height() / 2);
SizeToPreferredSize();
......
......@@ -22,14 +22,14 @@ class VIEWS_EXAMPLES_EXPORT ScrollViewExample : public ExampleBase,
public ButtonListener {
public:
ScrollViewExample();
virtual ~ScrollViewExample();
~ScrollViewExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
void ButtonPressed(Button* sender, const ui::Event& event) override;
// Control buttons to change the size of scrollable and jump to
// predefined position.
......
......@@ -16,15 +16,15 @@ namespace {
class SplittedView : public View {
public:
SplittedView();
virtual ~SplittedView();
~SplittedView() override;
void SetColor(SkColor from, SkColor to);
private:
// View:
virtual gfx::Size GetPreferredSize() const override;
virtual gfx::Size GetMinimumSize() const override;
virtual void Layout() override;
gfx::Size GetPreferredSize() const override;
gfx::Size GetMinimumSize() const override;
void Layout() override;
DISALLOW_COPY_AND_ASSIGN(SplittedView);
};
......
......@@ -17,14 +17,14 @@ class VIEWS_EXAMPLES_EXPORT SingleSplitViewExample
public SingleSplitViewListener {
public:
SingleSplitViewExample();
virtual ~SingleSplitViewExample();
~SingleSplitViewExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// SingleSplitViewListener:
virtual bool SplitHandleMoved(SingleSplitView* sender) override;
bool SplitHandleMoved(SingleSplitView* sender) override;
SingleSplitView* single_split_view_;
......
......@@ -18,14 +18,14 @@ class VIEWS_EXAMPLES_EXPORT SliderExample : public ExampleBase,
public SliderListener {
public:
SliderExample();
virtual ~SliderExample();
~SliderExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// SliderListener:
virtual void SliderValueChanged(Slider* sender,
void SliderValueChanged(Slider* sender,
float value,
float old_value,
SliderChangeReason reason) override;
......
......@@ -23,17 +23,17 @@ class VIEWS_EXAMPLES_EXPORT TabbedPaneExample : public ExampleBase,
public TabbedPaneListener {
public:
TabbedPaneExample();
virtual ~TabbedPaneExample();
~TabbedPaneExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
void ButtonPressed(Button* sender, const ui::Event& event) override;
// TabbedPaneListener:
virtual void TabSelectedAt(int index) override;
void TabSelectedAt(int index) override;
// Print the status of the tab in the status area.
void PrintStatus();
......
......@@ -33,28 +33,28 @@ class VIEWS_EXAMPLES_EXPORT TableExample : public ExampleBase,
public ButtonListener {
public:
TableExample();
virtual ~TableExample();
~TableExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
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;
int RowCount() override;
base::string16 GetText(int row, int column_id) override;
gfx::ImageSkia GetIcon(int row) override;
void SetObserver(ui::TableModelObserver* observer) override;
// TableGrouper:
virtual void GetGroupRange(int model_index, GroupRange* range) override;
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;
void OnSelectionChanged() override;
void OnDoubleClick() override;
void OnMiddleClick() override;
void OnKeyDown(ui::KeyboardCode virtual_keycode) override;
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
void ButtonPressed(Button* sender, const ui::Event& event) override;
private:
// The table to be tested.
......
......@@ -69,7 +69,7 @@ class TextExample::TextExampleView : public View {
elide_(gfx::NO_ELIDE) {
}
virtual void OnPaint(gfx::Canvas* canvas) override {
void OnPaint(gfx::Canvas* canvas) override {
View::OnPaint(canvas);
const gfx::Rect bounds = GetContentsBounds();
const SkColor color = SK_ColorDKGRAY;
......
......@@ -24,10 +24,10 @@ class VIEWS_EXAMPLES_EXPORT TextExample : public ExampleBase,
public ComboboxListener {
public:
TextExample();
virtual ~TextExample();
~TextExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
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;
void ButtonPressed(Button* button, const ui::Event& event) override;
// ComboboxListener:
virtual void OnPerformAction(Combobox* combobox) override;
void OnPerformAction(Combobox* combobox) override;
class TextExampleView;
// The content of the scroll view.
......
......@@ -24,22 +24,22 @@ class VIEWS_EXAMPLES_EXPORT TextfieldExample : public ExampleBase,
public ButtonListener {
public:
TextfieldExample();
virtual ~TextfieldExample();
~TextfieldExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// TextfieldController:
virtual void ContentsChanged(Textfield* sender,
void ContentsChanged(Textfield* sender,
const base::string16& new_contents) override;
virtual bool HandleKeyEvent(Textfield* sender,
bool HandleKeyEvent(Textfield* sender,
const ui::KeyEvent& key_event) override;
virtual bool HandleMouseEvent(Textfield* sender,
bool HandleMouseEvent(Textfield* sender,
const ui::MouseEvent& mouse_event) override;
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
void ButtonPressed(Button* sender, const ui::Event& event) override;
// Textfields for name and password.
Textfield* name_;
......
......@@ -25,11 +25,11 @@ class ThrobberView : public View {
throbber_->Start();
}
virtual gfx::Size GetPreferredSize() const override {
gfx::Size GetPreferredSize() const override {
return gfx::Size(width(), height());
}
virtual void Layout() override {
void Layout() override {
View* child = child_at(0);
gfx::Size ps = child->GetPreferredSize();
child->SetBounds((width() - ps.width()) / 2,
......
......@@ -14,10 +14,10 @@ namespace examples {
class VIEWS_EXAMPLES_EXPORT ThrobberExample : public ExampleBase {
public:
ThrobberExample();
virtual ~ThrobberExample();
~ThrobberExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
DISALLOW_COPY_AND_ASSIGN(ThrobberExample);
......
......@@ -28,10 +28,10 @@ class VIEWS_EXAMPLES_EXPORT TreeViewExample
public ui::SimpleMenuModel::Delegate {
public:
TreeViewExample();
virtual ~TreeViewExample();
~TreeViewExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
// IDs used by the context menu.
......@@ -48,24 +48,23 @@ class VIEWS_EXAMPLES_EXPORT TreeViewExample
bool IsCommandIdEnabled(int command_id);
// ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
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;
void OnTreeViewSelectionChanged(TreeView* tree_view) override;
bool CanEdit(TreeView* tree_view, ui::TreeModelNode* node) override;
// ContextMenuController:
virtual void ShowContextMenuForView(View* source,
void ShowContextMenuForView(View* source,
const gfx::Point& point,
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 GetAcceleratorForCommandId(
int command_id,
bool IsCommandIdChecked(int command_id) const override;
bool IsCommandIdEnabled(int command_id) const override;
bool GetAcceleratorForCommandId(int command_id,
ui::Accelerator* accelerator) override;
virtual void ExecuteCommand(int command_id, int event_flags) override;
void ExecuteCommand(int command_id, int event_flags) override;
// The tree view to be tested.
TreeView* tree_view_;
......
......@@ -20,10 +20,10 @@ namespace examples {
class WebViewExample : public ExampleBase {
public:
explicit WebViewExample(content::BrowserContext* browser_context);
virtual ~WebViewExample();
~WebViewExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
void CreateExampleView(View* container) override;
private:
WebView* webview_;
......
......@@ -23,11 +23,11 @@ namespace {
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;
~DialogExample() override;
base::string16 GetWindowTitle() const override;
View* CreateExtraView() override;
View* CreateTitlebarExtraView() override;
View* CreateFootnoteView() override;
};
DialogExample::DialogExample() {
......
......@@ -20,10 +20,10 @@ class VIEWS_EXAMPLES_EXPORT WidgetExample : public ExampleBase,
public ButtonListener {
public:
WidgetExample();
virtual ~WidgetExample();
~WidgetExample() override;
// ExampleBase:
virtual void CreateExampleView(View* container) override;
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;
void ButtonPressed(Button* sender, const ui::Event& event) override;
DISALLOW_COPY_AND_ASSIGN(WidgetExample);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment