Index: chrome/browser/ui/views/panels/panel_stack_view.h |
diff --git a/chrome/browser/ui/views/panels/panel_stack_view.h b/chrome/browser/ui/views/panels/panel_stack_view.h |
index c04e0c7810191ac0b437940a2bca856acfc75eca..96b324cb4a5d533c67a55902b21995bf7668cc21 100644 |
--- a/chrome/browser/ui/views/panels/panel_stack_view.h |
+++ b/chrome/browser/ui/views/panels/panel_stack_view.h |
@@ -42,22 +42,22 @@ class PanelStackView : public NativePanelStackWindow, |
protected: |
// Overridden from NativePanelStackWindow: |
- virtual void Close() OVERRIDE; |
- virtual void AddPanel(Panel* panel) OVERRIDE; |
- virtual void RemovePanel(Panel* panel) OVERRIDE; |
- virtual void MergeWith(NativePanelStackWindow* another) OVERRIDE; |
- virtual bool IsEmpty() const OVERRIDE; |
- virtual bool HasPanel(Panel* panel) const OVERRIDE; |
- virtual void MovePanelsBy(const gfx::Vector2d& delta) OVERRIDE; |
- virtual void BeginBatchUpdatePanelBounds(bool animate) OVERRIDE; |
+ virtual void Close() override; |
+ virtual void AddPanel(Panel* panel) override; |
+ virtual void RemovePanel(Panel* panel) override; |
+ virtual void MergeWith(NativePanelStackWindow* another) override; |
+ virtual bool IsEmpty() const override; |
+ virtual bool HasPanel(Panel* panel) const override; |
+ virtual void MovePanelsBy(const gfx::Vector2d& delta) override; |
+ virtual void BeginBatchUpdatePanelBounds(bool animate) override; |
virtual void AddPanelBoundsForBatchUpdate( |
- Panel* panel, const gfx::Rect& new_bounds) OVERRIDE; |
- virtual void EndBatchUpdatePanelBounds() OVERRIDE; |
- virtual bool IsAnimatingPanelBounds() const OVERRIDE; |
- virtual void Minimize() OVERRIDE; |
- virtual bool IsMinimized() const OVERRIDE; |
- virtual void DrawSystemAttention(bool draw_attention) OVERRIDE; |
- virtual void OnPanelActivated(Panel* panel) OVERRIDE; |
+ Panel* panel, const gfx::Rect& new_bounds) override; |
+ virtual void EndBatchUpdatePanelBounds() override; |
+ virtual bool IsAnimatingPanelBounds() const override; |
+ virtual void Minimize() override; |
+ virtual bool IsMinimized() const override; |
+ virtual void DrawSystemAttention(bool draw_attention) override; |
+ virtual void OnPanelActivated(Panel* panel) override; |
private: |
typedef std::list<Panel*> Panels; |
@@ -67,12 +67,12 @@ class PanelStackView : public NativePanelStackWindow, |
// Overridden from views::WidgetFocusChangeListener: |
virtual void OnNativeFocusChange(gfx::NativeView focused_before, |
- gfx::NativeView focused_now) OVERRIDE; |
+ gfx::NativeView focused_now) override; |
// Overridden from AnimationDelegate: |
- virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; |
- virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; |
- virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; |
+ virtual void AnimationEnded(const gfx::Animation* animation) override; |
+ virtual void AnimationProgressed(const gfx::Animation* animation) override; |
+ virtual void AnimationCanceled(const gfx::Animation* animation) override; |
// Updates the bounds of panels as specified in batch update data. |
void UpdatePanelsBounds(); |
@@ -99,10 +99,10 @@ class PanelStackView : public NativePanelStackWindow, |
UINT message, |
WPARAM w_param, |
LPARAM l_param, |
- LRESULT* l_result) OVERRIDE; |
+ LRESULT* l_result) override; |
// Overridden from TaskbarWindowThumbnailerDelegateWin: |
- virtual std::vector<HWND> GetSnapshotWindowHandles() const OVERRIDE; |
+ virtual std::vector<HWND> GetSnapshotWindowHandles() const override; |
// Updates the live preview snapshot when something changes, like |
// adding/removing/moving/resizing a stacked panel. |