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

Unified Diff: ui/gfx/render_text_mac.h

Issue 667923002: Standardize usage of virtual/override/final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/render_text_harfbuzz.h ('k') | ui/gfx/screen_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text_mac.h
diff --git a/ui/gfx/render_text_mac.h b/ui/gfx/render_text_mac.h
index f69bedb6067941a415a8c0e0feda5afa89f036f1..247bd53c038eef0c7438d4e4137c30ca360c069b 100644
--- a/ui/gfx/render_text_mac.h
+++ b/ui/gfx/render_text_mac.h
@@ -23,31 +23,31 @@ namespace gfx {
class RenderTextMac : public RenderText {
public:
RenderTextMac();
- virtual ~RenderTextMac();
+ ~RenderTextMac() override;
// Overridden from RenderText:
- virtual Size GetStringSize() override;
- virtual SizeF GetStringSizeF() override;
- virtual SelectionModel FindCursorPosition(const Point& point) override;
- virtual std::vector<FontSpan> GetFontSpansForTesting() override;
+ Size GetStringSize() override;
+ SizeF GetStringSizeF() override;
+ SelectionModel FindCursorPosition(const Point& point) override;
+ std::vector<FontSpan> GetFontSpansForTesting() override;
protected:
// Overridden from RenderText:
- virtual int GetLayoutTextBaseline() override;
- virtual SelectionModel AdjacentCharSelectionModel(
+ int GetLayoutTextBaseline() override;
+ SelectionModel AdjacentCharSelectionModel(
const SelectionModel& selection,
VisualCursorDirection direction) override;
- virtual SelectionModel AdjacentWordSelectionModel(
+ SelectionModel AdjacentWordSelectionModel(
const SelectionModel& selection,
VisualCursorDirection direction) override;
- virtual Range GetGlyphBounds(size_t index) 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;
+ Range GetGlyphBounds(size_t index) override;
+ std::vector<Rect> GetSubstringBounds(const Range& range) override;
+ size_t TextIndexToLayoutIndex(size_t index) const override;
+ size_t LayoutIndexToTextIndex(size_t index) const override;
+ bool IsValidCursorIndex(size_t index) override;
+ void ResetLayout() override;
+ void EnsureLayout() override;
+ void DrawVisualText(Canvas* canvas) override;
private:
struct TextRun {
« no previous file with comments | « ui/gfx/render_text_harfbuzz.h ('k') | ui/gfx/screen_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698