| Index: Source/core/rendering/RenderThemeChromiumDefault.h
|
| diff --git a/Source/core/rendering/RenderThemeChromiumDefault.h b/Source/core/rendering/RenderThemeChromiumDefault.h
|
| index bba1aa52d5e2cf090def54b1bb44683c2e83011b..bfd9a9c9ac6e6606994b0330dc9b7b131bc6def0 100644
|
| --- a/Source/core/rendering/RenderThemeChromiumDefault.h
|
| +++ b/Source/core/rendering/RenderThemeChromiumDefault.h
|
| @@ -38,10 +38,10 @@ public:
|
| static PassRefPtr<RenderTheme> create();
|
| virtual String extraDefaultStyleSheet();
|
|
|
| - virtual Color systemColor(CSSValueID) const;
|
| + virtual Color systemColor(CSSValueID) const OVERRIDE;
|
|
|
| // A method asking if the control changes its tint when the window has focus or not.
|
| - virtual bool controlSupportsTints(const RenderObject*) const;
|
| + virtual bool controlSupportsTints(const RenderObject*) const OVERRIDE;
|
|
|
| virtual bool supportsFocusRing(const RenderStyle*) const OVERRIDE;
|
|
|
| @@ -51,36 +51,36 @@ public:
|
| virtual Color inactiveListBoxSelectionBackgroundColor() const;
|
| virtual Color inactiveListBoxSelectionForegroundColor() const;
|
|
|
| - virtual Color platformActiveSelectionBackgroundColor() const;
|
| - virtual Color platformInactiveSelectionBackgroundColor() const;
|
| - virtual Color platformActiveSelectionForegroundColor() const;
|
| - virtual Color platformInactiveSelectionForegroundColor() const;
|
| + virtual Color platformActiveSelectionBackgroundColor() const OVERRIDE;
|
| + virtual Color platformInactiveSelectionBackgroundColor() const OVERRIDE;
|
| + virtual Color platformActiveSelectionForegroundColor() const OVERRIDE;
|
| + virtual Color platformInactiveSelectionForegroundColor() const OVERRIDE;
|
|
|
| virtual IntSize sliderTickSize() const OVERRIDE;
|
| virtual int sliderTickOffsetFromTrackCenter() const OVERRIDE;
|
| - virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
|
| + virtual void adjustSliderThumbSize(RenderStyle*, Element*) const OVERRIDE;
|
|
|
| static void setCaretBlinkInterval(double);
|
| virtual double caretBlinkIntervalInternal() const;
|
|
|
| - virtual bool paintCheckbox(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual void setCheckboxSize(RenderStyle*) const;
|
| + virtual bool paintCheckbox(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual void setCheckboxSize(RenderStyle*) const OVERRIDE;
|
|
|
| - virtual bool paintRadio(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual void setRadioSize(RenderStyle*) const;
|
| + virtual bool paintRadio(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual void setRadioSize(RenderStyle*) const OVERRIDE;
|
|
|
| - virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
|
| + virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
|
|
| - virtual void adjustInnerSpinButtonStyle(RenderStyle*, Element*) const;
|
| - virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&);
|
| + virtual void adjustInnerSpinButtonStyle(RenderStyle*, Element*) const OVERRIDE;
|
| + virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
|
|
| - virtual bool popsMenuBySpaceOrReturn() const OVERRIDE { return true; }
|
| + virtual bool popsMenuBySpaceOrReturn() const OVERRIDE FINAL { return true; }
|
|
|
| - virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&);
|
| + virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
|
|
| virtual bool shouldOpenPickerWithF4Key() const OVERRIDE;
|
|
|
| @@ -93,7 +93,7 @@ protected:
|
|
|
| private:
|
| // A general method asking if any control tinting is supported at all.
|
| - virtual bool supportsControlTints() const;
|
| + virtual bool supportsControlTints() const OVERRIDE;
|
|
|
| static double m_caretBlinkInterval;
|
|
|
|
|