| Index: chrome/browser/ui/browser_command_controller.h
|
| diff --git a/chrome/browser/ui/browser_command_controller.h b/chrome/browser/ui/browser_command_controller.h
|
| index 62e438654bf5e9421fb1f47fc3cdb0dcdeb6ae38..f9965b70aadfd9e45c526e773e999a642168fa61 100644
|
| --- a/chrome/browser/ui/browser_command_controller.h
|
| +++ b/chrome/browser/ui/browser_command_controller.h
|
| @@ -30,7 +30,7 @@ class BrowserCommandController : public CommandUpdaterDelegate,
|
| public TabRestoreServiceObserver {
|
| public:
|
| explicit BrowserCommandController(Browser* browser);
|
| - virtual ~BrowserCommandController();
|
| + ~BrowserCommandController() override;
|
|
|
| CommandUpdater* command_updater() { return &command_updater_; }
|
| bool block_command_execution() const { return block_command_execution_; }
|
| @@ -78,27 +78,25 @@ class BrowserCommandController : public CommandUpdaterDelegate,
|
| class InterstitialObserver;
|
|
|
| // Overridden from CommandUpdaterDelegate:
|
| - virtual void ExecuteCommandWithDisposition(
|
| - int id,
|
| - WindowOpenDisposition disposition) override;
|
| + void ExecuteCommandWithDisposition(int id, WindowOpenDisposition disposition)
|
| + override;
|
|
|
| // Overridden from TabStripModelObserver:
|
| - virtual void TabInsertedAt(content::WebContents* contents,
|
| - int index,
|
| - bool foreground) override;
|
| - virtual void TabDetachedAt(content::WebContents* contents,
|
| - int index) override;
|
| - virtual void TabReplacedAt(TabStripModel* tab_strip_model,
|
| - content::WebContents* old_contents,
|
| - content::WebContents* new_contents,
|
| - int index) override;
|
| - virtual void TabBlockedStateChanged(content::WebContents* contents,
|
| - int index) override;
|
| + void TabInsertedAt(content::WebContents* contents,
|
| + int index,
|
| + bool foreground) override;
|
| + void TabDetachedAt(content::WebContents* contents, int index) override;
|
| + void TabReplacedAt(TabStripModel* tab_strip_model,
|
| + content::WebContents* old_contents,
|
| + content::WebContents* new_contents,
|
| + int index) override;
|
| + void TabBlockedStateChanged(content::WebContents* contents,
|
| + int index) override;
|
|
|
| // 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;
|
|
|
| // Returns true if the regular Chrome UI (not the fullscreen one and
|
| // not the single-tab one) is shown. Used for updating window command states
|
|
|