Commit 9b1bc207 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=derat@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#301514}
parent 8340278f
......@@ -38,8 +38,7 @@
class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate {
public:
ScreenTypeDelegateWin() {}
virtual gfx::ScreenType GetScreenTypeForNativeView(
gfx::NativeView view) override {
gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override {
return chrome::IsNativeViewInAsh(view) ?
gfx::SCREEN_TYPE_ALTERNATE :
gfx::SCREEN_TYPE_NATIVE;
......@@ -51,7 +50,7 @@ class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate {
class ShellDialogsDelegateWin : public ui::ShellDialogsDelegate {
public:
ShellDialogsDelegateWin() {}
virtual bool IsWindowInMetro(gfx::NativeWindow window) override {
bool IsWindowInMetro(gfx::NativeWindow window) override {
#if defined(OS_WIN)
if (base::win::GetVersion() < base::win::VERSION_WIN8)
return false;
......
......@@ -12,12 +12,12 @@
class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
public:
ChromeBrowserMainExtraPartsAsh();
virtual ~ChromeBrowserMainExtraPartsAsh();
~ChromeBrowserMainExtraPartsAsh() override;
// Overridden from ChromeBrowserMainExtraParts:
virtual void PreProfileInit() override;
virtual void PostProfileInit() override;
virtual void PostMainMessageLoopRun() override;
void PreProfileInit() override;
void PostProfileInit() override;
void PostMainMessageLoopRun() override;
private:
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
......
......@@ -48,23 +48,23 @@ class TabScrubber : public ui::EventHandler,
private:
TabScrubber();
virtual ~TabScrubber();
~TabScrubber() override;
// ui::EventHandler overrides:
virtual void OnScrollEvent(ui::ScrollEvent* event) override;
void OnScrollEvent(ui::ScrollEvent* event) override;
// content::NotificationObserver overrides:
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) override;
void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) override;
// TabStripObserver overrides.
virtual void TabStripAddedTabAt(TabStrip* tab_strip, int index) override;
virtual void TabStripMovedTab(TabStrip* tab_strip,
int from_index,
int to_index) override;
virtual void TabStripRemovedTabAt(TabStrip* tab_strip, int index) override;
virtual void TabStripDeleted(TabStrip* tab_strip) override;
void TabStripAddedTabAt(TabStrip* tab_strip, int index) override;
void TabStripMovedTab(TabStrip* tab_strip,
int from_index,
int to_index) override;
void TabStripRemovedTabAt(TabStrip* tab_strip, int index) override;
void TabStripDeleted(TabStrip* tab_strip) override;
Browser* GetActiveBrowser();
void FinishScrub(bool activate);
......
......@@ -39,14 +39,14 @@ class TabScrubberTest : public InProcessBrowserTest,
: target_index_(-1) {
}
virtual void SetUpCommandLine(CommandLine* command_line) override {
void SetUpCommandLine(CommandLine* command_line) override {
#if defined(OS_CHROMEOS)
command_line->AppendSwitch(chromeos::switches::kNaturalScrollDefault);
#endif
command_line->AppendSwitch(switches::kOpenAsh);
}
virtual void SetUpOnMainThread() override {
void SetUpOnMainThread() override {
TabScrubber::GetInstance()->set_activation_delay(0);
// Disable external monitor scaling of coordinates.
......@@ -55,7 +55,7 @@ class TabScrubberTest : public InProcessBrowserTest,
ash::EventTransformationHandler::TRANSFORM_NONE);
}
virtual void TearDownOnMainThread() override {
void TearDownOnMainThread() override {
browser()->tab_strip_model()->RemoveObserver(this);
}
......@@ -178,46 +178,43 @@ class TabScrubberTest : public InProcessBrowserTest,
}
// TabStripModelObserver overrides.
virtual void TabInsertedAt(content::WebContents* contents,
int index,
bool foreground) override {}
virtual void TabClosingAt(TabStripModel* tab_strip_model,
content::WebContents* contents,
int index) override {}
virtual void TabDetachedAt(content::WebContents* contents,
int index) override {}
virtual void TabDeactivated(content::WebContents* contents) override {}
virtual void ActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) override {
void TabInsertedAt(content::WebContents* contents,
int index,
bool foreground) override {}
void TabClosingAt(TabStripModel* tab_strip_model,
content::WebContents* contents,
int index) override {}
void TabDetachedAt(content::WebContents* contents, int index) override {}
void TabDeactivated(content::WebContents* contents) override {}
void ActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) override {
activation_order_.push_back(index);
if (index == target_index_)
quit_closure_.Run();
}
virtual void TabSelectionChanged(
TabStripModel* tab_strip_model,
const ui::ListSelectionModel& old_model) override {}
virtual void TabMoved(content::WebContents* contents,
int from_index,
int to_index) override {}
virtual void TabChangedAt(content::WebContents* contents,
int index,
TabChangeType change_type) override {}
virtual void TabReplacedAt(TabStripModel* tab_strip_model,
content::WebContents* old_contents,
content::WebContents* new_contents,
void TabSelectionChanged(TabStripModel* tab_strip_model,
const ui::ListSelectionModel& old_model) override {}
void TabMoved(content::WebContents* contents,
int from_index,
int to_index) override {}
void TabChangedAt(content::WebContents* contents,
int index,
TabChangeType change_type) override {}
void TabReplacedAt(TabStripModel* tab_strip_model,
content::WebContents* old_contents,
content::WebContents* new_contents,
int index) override {}
void TabPinnedStateChanged(content::WebContents* contents,
int index) override {}
virtual void TabPinnedStateChanged(content::WebContents* contents,
int index) override {}
virtual void TabMiniStateChanged(content::WebContents* contents,
int index) override {
void TabMiniStateChanged(content::WebContents* contents, int index) override {
}
virtual void TabBlockedStateChanged(content::WebContents* contents,
int index) override {}
virtual void TabStripEmpty() override {}
virtual void TabStripModelDeleted() override {}
void TabBlockedStateChanged(content::WebContents* contents,
int index) override {}
void TabStripEmpty() override {}
void TabStripModelDeleted() override {}
// History of tab activation. Scrub() resets it.
std::vector<int> activation_order_;
......
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