| Index: chrome/browser/ui/panels/panel.h
|
| diff --git a/chrome/browser/ui/panels/panel.h b/chrome/browser/ui/panels/panel.h
|
| index 9f1dcc2e4288a03f94c3aa794fe4c97071098b77..64ed02373eba98b3a97ab4f2151674d0d0ff6617 100644
|
| --- a/chrome/browser/ui/panels/panel.h
|
| +++ b/chrome/browser/ui/panels/panel.h
|
| @@ -75,7 +75,7 @@ class Panel : public ui::BaseWindow,
|
| USE_SYSTEM_ATTENTION = 0x02
|
| };
|
|
|
| - virtual ~Panel();
|
| + ~Panel() override;
|
|
|
| // Returns the PanelManager associated with this panel.
|
| PanelManager* manager() const;
|
| @@ -116,40 +116,39 @@ class Panel : public ui::BaseWindow,
|
| bool CanShowRestoreButton() const;
|
|
|
| // ui::BaseWindow overrides.
|
| - virtual bool IsActive() const override;
|
| - virtual bool IsMaximized() const override;
|
| - virtual bool IsMinimized() const override;
|
| - virtual bool IsFullscreen() const override;
|
| - virtual gfx::NativeWindow GetNativeWindow() override;
|
| - virtual gfx::Rect GetRestoredBounds() const override;
|
| - virtual ui::WindowShowState GetRestoredState() const override;
|
| - virtual gfx::Rect GetBounds() const override;
|
| - virtual void Show() override;
|
| - virtual void Hide() override;
|
| - virtual void ShowInactive() override;
|
| - virtual void Close() override;
|
| - virtual void Activate() override;
|
| - virtual void Deactivate() override;
|
| - virtual void Maximize() override;
|
| - virtual void Minimize() override;
|
| - virtual void Restore() override;
|
| - virtual void SetBounds(const gfx::Rect& bounds) override;
|
| - virtual void FlashFrame(bool flash) override;
|
| - virtual bool IsAlwaysOnTop() const override;
|
| - virtual void SetAlwaysOnTop(bool on_top) override;
|
| + bool IsActive() const override;
|
| + bool IsMaximized() const override;
|
| + bool IsMinimized() const override;
|
| + bool IsFullscreen() const override;
|
| + gfx::NativeWindow GetNativeWindow() override;
|
| + gfx::Rect GetRestoredBounds() const override;
|
| + ui::WindowShowState GetRestoredState() const override;
|
| + gfx::Rect GetBounds() const override;
|
| + void Show() override;
|
| + void Hide() override;
|
| + void ShowInactive() override;
|
| + void Close() override;
|
| + void Activate() override;
|
| + void Deactivate() override;
|
| + void Maximize() override;
|
| + void Minimize() override;
|
| + void Restore() override;
|
| + void SetBounds(const gfx::Rect& bounds) override;
|
| + void FlashFrame(bool flash) override;
|
| + bool IsAlwaysOnTop() const override;
|
| + void SetAlwaysOnTop(bool on_top) override;
|
|
|
| // Overridden from CommandUpdaterDelegate:
|
| - virtual void ExecuteCommandWithDisposition(
|
| - int id,
|
| - WindowOpenDisposition disposition) override;
|
| + void ExecuteCommandWithDisposition(int id, WindowOpenDisposition disposition)
|
| + override;
|
|
|
| // content::NotificationObserver overrides.
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
|
|
| // extensions::ExtensionRegistryObserver.
|
| - virtual void OnExtensionUnloaded(
|
| + void OnExtensionUnloaded(
|
| content::BrowserContext* browser_context,
|
| const extensions::Extension* extension,
|
| extensions::UnloadedExtensionInfo::Reason reason) override;
|
|
|