summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/tab_restore_browsertest.cc
diff options
context:
space:
mode:
authorDaniel Cheng <dcheng@chromium.org>2014-10-21 02:51:29 -0700
committerDaniel Cheng <dcheng@chromium.org>2014-10-21 09:52:23 +0000
commita542fca3ccd35033c2065fa3e7bed1247043b377 (patch)
treebe0ed153cb1645a1bf02eb1ad1bb9b428cd4c722 /chrome/browser/sessions/tab_restore_browsertest.cc
parent716bedf160f4c4c1945cab54c3f490424a0eb779 (diff)
downloadchromium_src-a542fca3ccd35033c2065fa3e7bed1247043b377.zip
chromium_src-a542fca3ccd35033c2065fa3e7bed1247043b377.tar.gz
chromium_src-a542fca3ccd35033c2065fa3e7bed1247043b377.tar.bz2
Standardize usage of virtual/override/final in chrome/browser/
BUG=417463 TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/648653003 Cr-Commit-Position: refs/heads/master@{#300440}
Diffstat (limited to 'chrome/browser/sessions/tab_restore_browsertest.cc')
-rw-r--r--chrome/browser/sessions/tab_restore_browsertest.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc
index 8df9a6f..2f5bd98 100644
--- a/chrome/browser/sessions/tab_restore_browsertest.cc
+++ b/chrome/browser/sessions/tab_restore_browsertest.cc
@@ -48,7 +48,7 @@ class WaitForLoadObserver : public TabRestoreServiceObserver {
tab_restore_service_->AddObserver(this);
}
- virtual ~WaitForLoadObserver() {
+ ~WaitForLoadObserver() override {
if (do_wait_)
tab_restore_service_->RemoveObserver(this);
}
@@ -60,10 +60,9 @@ class WaitForLoadObserver : public TabRestoreServiceObserver {
private:
// Overridden from TabRestoreServiceObserver:
- virtual void TabRestoreServiceChanged(TabRestoreService* service) override {}
- virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override {
- }
- virtual void TabRestoreServiceLoaded(TabRestoreService* service) override {
+ void TabRestoreServiceChanged(TabRestoreService* service) override {}
+ void TabRestoreServiceDestroyed(TabRestoreService* service) override {}
+ void TabRestoreServiceLoaded(TabRestoreService* service) override {
DCHECK(do_wait_);
run_loop_.Quit();
}
@@ -87,7 +86,7 @@ class TabRestoreTest : public InProcessBrowserTest {
}
protected:
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
active_browser_list_ = BrowserList::GetInstance(chrome::GetActiveDesktop());
InProcessBrowserTest::SetUpOnMainThread();
}