| Index: chrome/browser/ui/views/panels/panel_view.h
|
| diff --git a/chrome/browser/ui/views/panels/panel_view.h b/chrome/browser/ui/views/panels/panel_view.h
|
| index b6e1759c31913d81aa3121ab6c220f6a9515ba02..9b00f623353a8db49bcf2386d0583a68dc2f07e9 100644
|
| --- a/chrome/browser/ui/views/panels/panel_view.h
|
| +++ b/chrome/browser/ui/views/panels/panel_view.h
|
| @@ -40,51 +40,51 @@ class PanelView : public NativePanel,
|
| virtual ~PanelView();
|
|
|
| // Overridden from NativePanel:
|
| - virtual void ShowPanel() OVERRIDE;
|
| - virtual void ShowPanelInactive() OVERRIDE;
|
| - virtual gfx::Rect GetPanelBounds() const OVERRIDE;
|
| - virtual void SetPanelBounds(const gfx::Rect& bounds) OVERRIDE;
|
| - virtual void SetPanelBoundsInstantly(const gfx::Rect& bounds) OVERRIDE;
|
| - virtual void ClosePanel() OVERRIDE;
|
| - virtual void ActivatePanel() OVERRIDE;
|
| - virtual void DeactivatePanel() OVERRIDE;
|
| - virtual bool IsPanelActive() const OVERRIDE;
|
| - virtual void PreventActivationByOS(bool prevent_activation) OVERRIDE;
|
| - virtual gfx::NativeWindow GetNativePanelWindow() OVERRIDE;
|
| - virtual void UpdatePanelTitleBar() OVERRIDE;
|
| - virtual void UpdatePanelLoadingAnimations(bool should_animate) OVERRIDE;
|
| - virtual void PanelWebContentsFocused(content::WebContents* contents) OVERRIDE;
|
| - virtual void PanelCut() OVERRIDE;
|
| - virtual void PanelCopy() OVERRIDE;
|
| - virtual void PanelPaste() OVERRIDE;
|
| - virtual void DrawAttention(bool draw_attention) OVERRIDE;
|
| - virtual bool IsDrawingAttention() const OVERRIDE;
|
| + virtual void ShowPanel() override;
|
| + virtual void ShowPanelInactive() override;
|
| + virtual gfx::Rect GetPanelBounds() const override;
|
| + virtual void SetPanelBounds(const gfx::Rect& bounds) override;
|
| + virtual void SetPanelBoundsInstantly(const gfx::Rect& bounds) override;
|
| + virtual void ClosePanel() override;
|
| + virtual void ActivatePanel() override;
|
| + virtual void DeactivatePanel() override;
|
| + virtual bool IsPanelActive() const override;
|
| + virtual void PreventActivationByOS(bool prevent_activation) override;
|
| + virtual gfx::NativeWindow GetNativePanelWindow() override;
|
| + virtual void UpdatePanelTitleBar() override;
|
| + virtual void UpdatePanelLoadingAnimations(bool should_animate) override;
|
| + virtual void PanelWebContentsFocused(content::WebContents* contents) override;
|
| + virtual void PanelCut() override;
|
| + virtual void PanelCopy() override;
|
| + virtual void PanelPaste() override;
|
| + virtual void DrawAttention(bool draw_attention) override;
|
| + virtual bool IsDrawingAttention() const override;
|
| virtual void HandlePanelKeyboardEvent(
|
| - const content::NativeWebKeyboardEvent& event) OVERRIDE;
|
| - virtual void FullScreenModeChanged(bool is_full_screen) OVERRIDE;
|
| - virtual bool IsPanelAlwaysOnTop() const OVERRIDE;
|
| - virtual void SetPanelAlwaysOnTop(bool on_top) OVERRIDE;
|
| - virtual void UpdatePanelMinimizeRestoreButtonVisibility() OVERRIDE;
|
| - virtual void SetWindowCornerStyle(panel::CornerStyle corner_style) OVERRIDE;
|
| + const content::NativeWebKeyboardEvent& event) override;
|
| + virtual void FullScreenModeChanged(bool is_full_screen) override;
|
| + virtual bool IsPanelAlwaysOnTop() const override;
|
| + virtual void SetPanelAlwaysOnTop(bool on_top) override;
|
| + virtual void UpdatePanelMinimizeRestoreButtonVisibility() override;
|
| + virtual void SetWindowCornerStyle(panel::CornerStyle corner_style) override;
|
| virtual void PanelExpansionStateChanging(
|
| Panel::ExpansionState old_state,
|
| - Panel::ExpansionState new_state) OVERRIDE;
|
| - virtual void AttachWebContents(content::WebContents* contents) OVERRIDE;
|
| - virtual void DetachWebContents(content::WebContents* contents) OVERRIDE;
|
| + Panel::ExpansionState new_state) override;
|
| + virtual void AttachWebContents(content::WebContents* contents) override;
|
| + virtual void DetachWebContents(content::WebContents* contents) override;
|
| virtual gfx::Size WindowSizeFromContentSize(
|
| - const gfx::Size& content_size) const OVERRIDE;
|
| + const gfx::Size& content_size) const override;
|
| virtual gfx::Size ContentSizeFromWindowSize(
|
| - const gfx::Size& window_size) const OVERRIDE;
|
| - virtual int TitleOnlyHeight() const OVERRIDE;
|
| - virtual void MinimizePanelBySystem() OVERRIDE;
|
| - virtual bool IsPanelMinimizedBySystem() const OVERRIDE;
|
| - virtual bool IsPanelShownOnActiveDesktop() const OVERRIDE;
|
| - virtual void ShowShadow(bool show) OVERRIDE;
|
| - virtual NativePanelTesting* CreateNativePanelTesting() OVERRIDE;
|
| + const gfx::Size& window_size) const override;
|
| + virtual int TitleOnlyHeight() const override;
|
| + virtual void MinimizePanelBySystem() override;
|
| + virtual bool IsPanelMinimizedBySystem() const override;
|
| + virtual bool IsPanelShownOnActiveDesktop() const override;
|
| + virtual void ShowShadow(bool show) override;
|
| + virtual NativePanelTesting* CreateNativePanelTesting() override;
|
|
|
| // Overridden from views::View:
|
| - virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
| - virtual gfx::Size GetMaximumSize() const OVERRIDE;
|
| + virtual gfx::Size GetMinimumSize() const override;
|
| + virtual gfx::Size GetMaximumSize() const override;
|
|
|
| // Return true if the mouse event is handled.
|
| // |mouse_location| is in screen coordinate system.
|
| @@ -114,35 +114,35 @@ class PanelView : public NativePanel,
|
| };
|
|
|
| // Overridden from views::WidgetDelegate:
|
| - virtual void OnDisplayChanged() OVERRIDE;
|
| - virtual void OnWorkAreaChanged() OVERRIDE;
|
| - virtual bool WillProcessWorkAreaChange() const OVERRIDE;
|
| - virtual views::View* GetContentsView() OVERRIDE;
|
| + virtual void OnDisplayChanged() override;
|
| + virtual void OnWorkAreaChanged() override;
|
| + virtual bool WillProcessWorkAreaChange() const override;
|
| + virtual views::View* GetContentsView() override;
|
| virtual views::NonClientFrameView* CreateNonClientFrameView(
|
| - views::Widget* widget) OVERRIDE;
|
| - virtual bool CanResize() const OVERRIDE;
|
| - virtual bool CanMaximize() const OVERRIDE;
|
| - virtual bool CanMinimize() const OVERRIDE;
|
| - virtual views::Widget* GetWidget() OVERRIDE;
|
| - virtual const views::Widget* GetWidget() const OVERRIDE;
|
| - virtual base::string16 GetWindowTitle() const OVERRIDE;
|
| - virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE;
|
| - virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
|
| - virtual void WindowClosing() OVERRIDE;
|
| - virtual void DeleteDelegate() OVERRIDE;
|
| - virtual void OnWindowBeginUserBoundsChange() OVERRIDE;
|
| - virtual void OnWindowEndUserBoundsChange() OVERRIDE;
|
| + views::Widget* widget) override;
|
| + virtual bool CanResize() const override;
|
| + virtual bool CanMaximize() const override;
|
| + virtual bool CanMinimize() const override;
|
| + virtual views::Widget* GetWidget() override;
|
| + virtual const views::Widget* GetWidget() const override;
|
| + virtual base::string16 GetWindowTitle() const override;
|
| + virtual gfx::ImageSkia GetWindowAppIcon() override;
|
| + virtual gfx::ImageSkia GetWindowIcon() override;
|
| + virtual void WindowClosing() override;
|
| + virtual void DeleteDelegate() override;
|
| + virtual void OnWindowBeginUserBoundsChange() override;
|
| + virtual void OnWindowEndUserBoundsChange() override;
|
|
|
| // Overridden from views::View:
|
| - virtual void Layout() OVERRIDE;
|
| - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
|
| + virtual void Layout() override;
|
| + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
|
|
|
| // Overridden from views::WidgetObserver:
|
| - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
|
| + virtual void OnWidgetDestroying(views::Widget* widget) override;
|
| virtual void OnWidgetActivationChanged(views::Widget* widget,
|
| - bool active) OVERRIDE;
|
| + bool active) override;
|
| virtual void OnWidgetBoundsChanged(views::Widget* widget,
|
| - const gfx::Rect& new_bounds) OVERRIDE;
|
| + const gfx::Rect& new_bounds) override;
|
|
|
| // Overridden from ui::HWNDMessageFilter:
|
| #if defined(OS_WIN)
|
| @@ -150,12 +150,12 @@ class PanelView : public NativePanel,
|
| UINT message,
|
| WPARAM w_param,
|
| LPARAM l_param,
|
| - LRESULT* l_result) OVERRIDE;
|
| + LRESULT* l_result) override;
|
| #endif
|
|
|
| // Overridden from AnimationDelegate:
|
| - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
|
| - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
|
| + virtual void AnimationEnded(const gfx::Animation* animation) override;
|
| + virtual void AnimationProgressed(const gfx::Animation* animation) override;
|
|
|
| void UpdateLoadingAnimations(bool should_animate);
|
| void UpdateWindowTitle();
|
|
|