| 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 22725cc80eac1ae8fc9c489ffea5a677dbea96c2..2178f9b4d82ef1cd9f646bd035cfa1a4288af9de 100644
|
| --- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
|
| +++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
|
| @@ -38,10 +38,10 @@ class BrowserStatusMonitor::LocalWebContentsObserver
|
| : content::WebContentsObserver(contents),
|
| monitor_(monitor) {}
|
|
|
| - virtual ~LocalWebContentsObserver() {}
|
| + ~LocalWebContentsObserver() override {}
|
|
|
| // content::WebContentsObserver
|
| - virtual void DidNavigateMainFrame(
|
| + void DidNavigateMainFrame(
|
| const content::LoadCommittedDetails& details,
|
| const content::FrameNavigateParams& params) override {
|
| Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
|
| @@ -61,7 +61,7 @@ class BrowserStatusMonitor::LocalWebContentsObserver
|
| monitor_->SetShelfIDForBrowserWindowContents(browser, web_contents());
|
| }
|
|
|
| - virtual void WebContentsDestroyed() override {
|
| + 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());
|
| @@ -80,10 +80,10 @@ class BrowserStatusMonitor::SettingsWindowObserver
|
| : public chrome::SettingsWindowManagerObserver {
|
| public:
|
| SettingsWindowObserver() {}
|
| - virtual ~SettingsWindowObserver() {}
|
| + ~SettingsWindowObserver() override {}
|
|
|
| // SettingsWindowManagerObserver
|
| - virtual void OnNewSettingsWindow(Browser* settings_browser) override {
|
| + void OnNewSettingsWindow(Browser* settings_browser) override {
|
| ash::SetShelfItemDetailsForDialogWindow(
|
| settings_browser->window()->GetNativeWindow(),
|
| IDR_ASH_SHELF_ICON_SETTINGS,
|
|
|