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

Unified Diff: ui/gfx/platform_font_ios.h

Issue 840813009: Enable strict-virtual-specifiers for iOS builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
Index: ui/gfx/platform_font_ios.h
diff --git a/ui/gfx/platform_font_ios.h b/ui/gfx/platform_font_ios.h
index 8d2e7a12bf697b542fa34f52f297ef83e1417023..ec09a00ddd0dc438fc1b0ebab43a7f445a174c9f 100644
--- a/ui/gfx/platform_font_ios.h
+++ b/ui/gfx/platform_font_ios.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
Nico 2015/01/20 15:48:27 ?
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -17,21 +17,21 @@ class PlatformFontIOS : public PlatformFont {
int font_size);
// Overridden from PlatformFont:
- virtual Font DeriveFont(int size_delta, int style) const override;
- virtual int GetHeight() const override;
- virtual int GetBaseline() const override;
- virtual int GetCapHeight() const override;
- virtual int GetExpectedTextWidth(int length) const override;
- virtual int GetStyle() const override;
- virtual std::string GetFontName() const override;
- virtual std::string GetActualFontNameForTesting() const override;
- virtual int GetFontSize() const override;
- virtual const FontRenderParams& GetFontRenderParams() override;
- virtual NativeFont GetNativeFont() const override;
+ Font DeriveFont(int size_delta, int style) const override;
+ int GetHeight() const override;
+ int GetBaseline() const override;
+ int GetCapHeight() const override;
+ int GetExpectedTextWidth(int length) const override;
+ int GetStyle() const override;
+ std::string GetFontName() const override;
+ std::string GetActualFontNameForTesting() const override;
+ int GetFontSize() const override;
+ const FontRenderParams& GetFontRenderParams() override;
+ NativeFont GetNativeFont() const override;
private:
PlatformFontIOS(const std::string& font_name, int font_size, int style);
- virtual ~PlatformFontIOS() {}
+ ~PlatformFontIOS() override {}
// Initialize the object with the specified parameters.
void InitWithNameSizeAndStyle(const std::string& font_name,

Powered by Google App Engine
This is Rietveld 408576698