| Index: chrome/browser/ui/panels/docked_panel_collection.h
|
| diff --git a/chrome/browser/ui/panels/docked_panel_collection.h b/chrome/browser/ui/panels/docked_panel_collection.h
|
| index acdd3de1e02a4d422760542cddabdcaf8c413d8d..847bf8b67391e7a1bcd1caf0b27c3635c7ad2955 100644
|
| --- a/chrome/browser/ui/panels/docked_panel_collection.h
|
| +++ b/chrome/browser/ui/panels/docked_panel_collection.h
|
| @@ -30,49 +30,49 @@ class DockedPanelCollection :
|
| virtual ~DockedPanelCollection();
|
|
|
| // PanelCollection OVERRIDES:
|
| - virtual void OnDisplayChanged() OVERRIDE;
|
| + virtual void OnDisplayChanged() override;
|
|
|
| // Rearranges the positions of the panels in the collection
|
| // and reduces their width when there is not enough room.
|
| // This is called when the display space has been changed, i.e. working
|
| // area being changed or a panel being closed.
|
| - virtual void RefreshLayout() OVERRIDE;
|
| + virtual void RefreshLayout() override;
|
|
|
| // Adds a panel to the collection. The panel may be a newly created panel or
|
| // one that is transitioning from another grouping of panels.
|
| virtual void AddPanel(Panel* panel,
|
| - PositioningMask positioning_mask) OVERRIDE;
|
| - virtual void RemovePanel(Panel* pane, RemovalReason reasonl) OVERRIDE;
|
| - virtual void CloseAll() OVERRIDE;
|
| + PositioningMask positioning_mask) override;
|
| + virtual void RemovePanel(Panel* pane, RemovalReason reasonl) override;
|
| + virtual void CloseAll() override;
|
| virtual void ResizePanelWindow(
|
| Panel* panel,
|
| - const gfx::Size& preferred_window_size) OVERRIDE;
|
| + const gfx::Size& preferred_window_size) override;
|
| virtual panel::Resizability GetPanelResizability(
|
| - const Panel* panel) const OVERRIDE;
|
| + const Panel* panel) const override;
|
| virtual void OnPanelResizedByMouse(Panel* panel,
|
| - const gfx::Rect& new_bounds) OVERRIDE;
|
| - virtual void OnPanelAttentionStateChanged(Panel* panel) OVERRIDE;
|
| + const gfx::Rect& new_bounds) override;
|
| + virtual void OnPanelAttentionStateChanged(Panel* panel) override;
|
| virtual void OnPanelTitlebarClicked(Panel* panel,
|
| - panel::ClickModifier modifier) OVERRIDE;
|
| - virtual void ActivatePanel(Panel* panel) OVERRIDE;
|
| - virtual void MinimizePanel(Panel* panel) OVERRIDE;
|
| - virtual void RestorePanel(Panel* panel) OVERRIDE;
|
| + panel::ClickModifier modifier) override;
|
| + virtual void ActivatePanel(Panel* panel) override;
|
| + virtual void MinimizePanel(Panel* panel) override;
|
| + virtual void RestorePanel(Panel* panel) override;
|
| virtual void OnMinimizeButtonClicked(Panel* panel,
|
| - panel::ClickModifier modifier) OVERRIDE;
|
| + panel::ClickModifier modifier) override;
|
| virtual void OnRestoreButtonClicked(Panel* panel,
|
| - panel::ClickModifier modifier) OVERRIDE;
|
| - virtual bool CanShowMinimizeButton(const Panel* panel) const OVERRIDE;
|
| - virtual bool CanShowRestoreButton(const Panel* panel) const OVERRIDE;
|
| - virtual bool IsPanelMinimized(const Panel* panel) const OVERRIDE;
|
| - virtual bool UsesAlwaysOnTopPanels() const OVERRIDE;
|
| - virtual void SavePanelPlacement(Panel* panel) OVERRIDE;
|
| - virtual void RestorePanelToSavedPlacement() OVERRIDE;
|
| - virtual void DiscardSavedPanelPlacement() OVERRIDE;
|
| - virtual void UpdatePanelOnCollectionChange(Panel* panel) OVERRIDE;
|
| - virtual void OnPanelExpansionStateChanged(Panel* panel) OVERRIDE;
|
| - virtual void OnPanelActiveStateChanged(Panel* panel) OVERRIDE;
|
| + panel::ClickModifier modifier) override;
|
| + virtual bool CanShowMinimizeButton(const Panel* panel) const override;
|
| + virtual bool CanShowRestoreButton(const Panel* panel) const override;
|
| + virtual bool IsPanelMinimized(const Panel* panel) const override;
|
| + virtual bool UsesAlwaysOnTopPanels() const override;
|
| + virtual void SavePanelPlacement(Panel* panel) override;
|
| + virtual void RestorePanelToSavedPlacement() override;
|
| + virtual void DiscardSavedPanelPlacement() override;
|
| + virtual void UpdatePanelOnCollectionChange(Panel* panel) override;
|
| + virtual void OnPanelExpansionStateChanged(Panel* panel) override;
|
| + virtual void OnPanelActiveStateChanged(Panel* panel) override;
|
| virtual gfx::Rect GetInitialPanelBounds(
|
| - const gfx::Rect& requested_bounds) const OVERRIDE;
|
| + const gfx::Rect& requested_bounds) const override;
|
|
|
| // Returns true if we should bring up the titlebars, given the current mouse
|
| // point.
|
| @@ -128,15 +128,15 @@ class DockedPanelCollection :
|
| };
|
|
|
| // Overridden from PanelMouseWatcherObserver:
|
| - virtual void OnMouseMove(const gfx::Point& mouse_position) OVERRIDE;
|
| + virtual void OnMouseMove(const gfx::Point& mouse_position) override;
|
|
|
| // Overridden from DisplaySettingsProvider::DesktopBarObserver:
|
| virtual void OnAutoHidingDesktopBarVisibilityChanged(
|
| DisplaySettingsProvider::DesktopBarAlignment alignment,
|
| - DisplaySettingsProvider::DesktopBarVisibility visibility) OVERRIDE;
|
| + DisplaySettingsProvider::DesktopBarVisibility visibility) override;
|
| virtual void OnAutoHidingDesktopBarThicknessChanged(
|
| DisplaySettingsProvider::DesktopBarAlignment alignment,
|
| - int thickness) OVERRIDE;
|
| + int thickness) override;
|
|
|
| // Schedules a layout refresh with a short delay to avoid too much flicker.
|
| void ScheduleLayoutRefresh();
|
|
|