Index: chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc |
diff --git a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc |
index 1d518bb437e4524215d3c45c86cd9fe78c899b1a..87ccc9f0adacaa944b779120a7632d8b0829fb06 100644 |
--- a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc |
+++ b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc |
@@ -39,14 +39,14 @@ class TabScrubberTest : public InProcessBrowserTest, |
: target_index_(-1) { |
} |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual 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 { |
+ virtual 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 { |
+ virtual void TearDownOnMainThread() override { |
browser()->tab_strip_model()->RemoveObserver(this); |
} |
@@ -179,17 +179,17 @@ class TabScrubberTest : public InProcessBrowserTest, |
// TabStripModelObserver overrides. |
virtual void TabInsertedAt(content::WebContents* contents, |
int index, |
- bool foreground) OVERRIDE {} |
+ bool foreground) override {} |
virtual void TabClosingAt(TabStripModel* tab_strip_model, |
content::WebContents* contents, |
- int index) OVERRIDE {} |
+ int index) override {} |
virtual void TabDetachedAt(content::WebContents* contents, |
- int index) OVERRIDE {} |
- virtual void TabDeactivated(content::WebContents* contents) OVERRIDE {} |
+ 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 { |
+ int reason) override { |
activation_order_.push_back(index); |
if (index == target_index_) |
quit_closure_.Run(); |
@@ -197,26 +197,26 @@ class TabScrubberTest : public InProcessBrowserTest, |
virtual void TabSelectionChanged( |
TabStripModel* tab_strip_model, |
- const ui::ListSelectionModel& old_model) OVERRIDE {} |
+ const ui::ListSelectionModel& old_model) override {} |
virtual void TabMoved(content::WebContents* contents, |
int from_index, |
- int to_index) OVERRIDE {} |
+ int to_index) override {} |
virtual void TabChangedAt(content::WebContents* contents, |
int index, |
- TabChangeType change_type) OVERRIDE {} |
+ TabChangeType change_type) override {} |
virtual void TabReplacedAt(TabStripModel* tab_strip_model, |
content::WebContents* old_contents, |
content::WebContents* new_contents, |
- int index) OVERRIDE {} |
+ int index) override {} |
virtual void TabPinnedStateChanged(content::WebContents* contents, |
- int index) OVERRIDE {} |
+ int index) override {} |
virtual void TabMiniStateChanged(content::WebContents* contents, |
- int index) OVERRIDE { |
+ int index) override { |
} |
virtual void TabBlockedStateChanged(content::WebContents* contents, |
- int index) OVERRIDE {} |
- virtual void TabStripEmpty() OVERRIDE {} |
- virtual void TabStripModelDeleted() OVERRIDE {} |
+ int index) override {} |
+ virtual void TabStripEmpty() override {} |
+ virtual void TabStripModelDeleted() override {} |
// History of tab activation. Scrub() resets it. |
std::vector<int> activation_order_; |