Index: ui/gfx/render_text_harfbuzz.h |
diff --git a/ui/gfx/render_text_harfbuzz.h b/ui/gfx/render_text_harfbuzz.h |
index 8936e53cdebc4b6dec7e7ecb3631127c6eff9811..329be9f9f10cf6bc1728d3034520ccf8e32c8146 100644 |
--- a/ui/gfx/render_text_harfbuzz.h |
+++ b/ui/gfx/render_text_harfbuzz.h |
@@ -80,28 +80,28 @@ class GFX_EXPORT RenderTextHarfBuzz : public RenderText { |
virtual ~RenderTextHarfBuzz(); |
// Overridden from RenderText. |
- virtual Size GetStringSize() OVERRIDE; |
- virtual SizeF GetStringSizeF() OVERRIDE; |
- virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE; |
- virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE; |
- virtual Range GetGlyphBounds(size_t index) OVERRIDE; |
+ virtual Size GetStringSize() override; |
+ virtual SizeF GetStringSizeF() override; |
+ virtual SelectionModel FindCursorPosition(const Point& point) override; |
+ virtual std::vector<FontSpan> GetFontSpansForTesting() override; |
+ virtual Range GetGlyphBounds(size_t index) override; |
protected: |
// Overridden from RenderText. |
- virtual int GetLayoutTextBaseline() OVERRIDE; |
+ virtual int GetLayoutTextBaseline() override; |
virtual SelectionModel AdjacentCharSelectionModel( |
const SelectionModel& selection, |
- VisualCursorDirection direction) OVERRIDE; |
+ VisualCursorDirection direction) override; |
virtual SelectionModel AdjacentWordSelectionModel( |
const SelectionModel& selection, |
- VisualCursorDirection direction) OVERRIDE; |
- virtual std::vector<Rect> GetSubstringBounds(const Range& range) OVERRIDE; |
- virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; |
- virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; |
- virtual bool IsValidCursorIndex(size_t index) OVERRIDE; |
- virtual void ResetLayout() OVERRIDE; |
- virtual void EnsureLayout() OVERRIDE; |
- virtual void DrawVisualText(Canvas* canvas) OVERRIDE; |
+ VisualCursorDirection direction) override; |
+ virtual std::vector<Rect> GetSubstringBounds(const Range& range) override; |
+ virtual size_t TextIndexToLayoutIndex(size_t index) const override; |
+ virtual size_t LayoutIndexToTextIndex(size_t index) const override; |
+ virtual bool IsValidCursorIndex(size_t index) override; |
+ virtual void ResetLayout() override; |
+ virtual void EnsureLayout() override; |
+ virtual void DrawVisualText(Canvas* canvas) override; |
private: |
friend class RenderTextTest; |