| Index: ui/views/bubble/bubble_frame_view.h
|
| diff --git a/ui/views/bubble/bubble_frame_view.h b/ui/views/bubble/bubble_frame_view.h
|
| index f14ca1ecf5945cac8f8af8dd8e1a8dbbfaa1d672..1d3add744608f8612d48f367abe2de417df14b1e 100644
|
| --- a/ui/views/bubble/bubble_frame_view.h
|
| +++ b/ui/views/bubble/bubble_frame_view.h
|
| @@ -40,33 +40,33 @@ class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView,
|
| static LabelButton* CreateCloseButton(ButtonListener* listener);
|
|
|
| // NonClientFrameView overrides:
|
| - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
|
| + virtual gfx::Rect GetBoundsForClientView() const override;
|
| virtual gfx::Rect GetWindowBoundsForClientBounds(
|
| - const gfx::Rect& client_bounds) const OVERRIDE;
|
| - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
|
| + const gfx::Rect& client_bounds) const override;
|
| + virtual int NonClientHitTest(const gfx::Point& point) override;
|
| virtual void GetWindowMask(const gfx::Size& size,
|
| - gfx::Path* window_mask) OVERRIDE;
|
| - virtual void ResetWindowControls() OVERRIDE;
|
| - virtual void UpdateWindowIcon() OVERRIDE;
|
| - virtual void UpdateWindowTitle() OVERRIDE;
|
| - virtual void SizeConstraintsChanged() OVERRIDE;
|
| + gfx::Path* window_mask) override;
|
| + virtual void ResetWindowControls() override;
|
| + virtual void UpdateWindowIcon() override;
|
| + virtual void UpdateWindowTitle() override;
|
| + virtual void SizeConstraintsChanged() override;
|
|
|
| // Set the FontList to be used for the title of the bubble.
|
| // Caller must arrange to update the layout to have the call take effect.
|
| void SetTitleFontList(const gfx::FontList& font_list);
|
|
|
| // View overrides:
|
| - virtual gfx::Insets GetInsets() const OVERRIDE;
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| - virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
| - virtual void Layout() OVERRIDE;
|
| - virtual const char* GetClassName() const OVERRIDE;
|
| - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
|
| - virtual void OnThemeChanged() OVERRIDE;
|
| - virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE;
|
| + virtual gfx::Insets GetInsets() const override;
|
| + virtual gfx::Size GetPreferredSize() const override;
|
| + virtual gfx::Size GetMinimumSize() const override;
|
| + virtual void Layout() override;
|
| + virtual const char* GetClassName() const override;
|
| + virtual void ChildPreferredSizeChanged(View* child) override;
|
| + virtual void OnThemeChanged() override;
|
| + virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
|
|
|
| // Overridden from ButtonListener:
|
| - virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
|
| + virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
|
|
|
| // Use bubble_border() and SetBubbleBorder(), not border() and SetBorder().
|
| BubbleBorder* bubble_border() const { return bubble_border_; }
|
|
|