Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Unified Diff: ui/gfx/render_text_harfbuzz.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/platform_font_win.h ('k') | ui/gfx/render_text_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ui/gfx/platform_font_win.h ('k') | ui/gfx/render_text_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698