chrome/browser/ui/ash/launcher/browser_status_monitor.cc - Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/browser_status_monitor.cc

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_status_monitor.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/browser_status_monitor.cc

diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

index 93f6ef12979aeebada000a1b12bd126319305821..22725cc80eac1ae8fc9c489ffea5a677dbea96c2 100644

--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

@@ -43,7 +43,7 @@ class BrowserStatusMonitor::LocalWebContentsObserver

// content::WebContentsObserver

virtual void DidNavigateMainFrame(

const content::LoadCommittedDetails& details,

- const content::FrameNavigateParams& params) OVERRIDE {

+ const content::FrameNavigateParams& params) override {

Browser* browser = chrome::FindBrowserWithWebContents(web_contents());

ChromeLauncherController::AppState state =

ChromeLauncherController::APP_STATE_INACTIVE;

@@ -61,7 +61,7 @@ class BrowserStatusMonitor::LocalWebContentsObserver

monitor_->SetShelfIDForBrowserWindowContents(browser, web_contents());

}

- virtual void WebContentsDestroyed() OVERRIDE {

+ virtual void WebContentsDestroyed() override {

// We can only come here when there was a non standard termination like

// an app got un-installed while running, etc.

monitor_->WebContentsDestroyed(web_contents());

@@ -83,7 +83,7 @@ class BrowserStatusMonitor::SettingsWindowObserver

virtual ~SettingsWindowObserver() {}

// SettingsWindowManagerObserver

- virtual void OnNewSettingsWindow(Browser* settings_browser) OVERRIDE {

+ virtual void OnNewSettingsWindow(Browser* settings_browser) override {

ash::SetShelfItemDetailsForDialogWindow(

settings_browser->window()->GetNativeWindow(),

IDR_ASH_SHELF_ICON_SETTINGS,