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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/platform/text/LocaleMac.h

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase build fix 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 unified diff | Download patch
« no previous file with comments | « Source/platform/text/LocaleICU.h ('k') | Source/platform/text/LocaleWin.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 OBJC_CLASS NSLocale; 42 OBJC_CLASS NSLocale;
43 43
44 namespace blink { 44 namespace blink {
45 45
46 class PLATFORM_EXPORT LocaleMac : public Locale { 46 class PLATFORM_EXPORT LocaleMac : public Locale {
47 public: 47 public:
48 static PassOwnPtr<LocaleMac> create(const String&); 48 static PassOwnPtr<LocaleMac> create(const String&);
49 static PassOwnPtr<LocaleMac> create(NSLocale*); 49 static PassOwnPtr<LocaleMac> create(NSLocale*);
50 ~LocaleMac(); 50 ~LocaleMac();
51 51
52 virtual const Vector<String>& weekDayShortLabels() OVERRIDE; 52 virtual const Vector<String>& weekDayShortLabels() override;
53 virtual unsigned firstDayOfWeek() OVERRIDE; 53 virtual unsigned firstDayOfWeek() override;
54 virtual bool isRTL() OVERRIDE; 54 virtual bool isRTL() override;
55 55
56 virtual String dateFormat() OVERRIDE; 56 virtual String dateFormat() override;
57 virtual String monthFormat() OVERRIDE; 57 virtual String monthFormat() override;
58 virtual String shortMonthFormat() OVERRIDE; 58 virtual String shortMonthFormat() override;
59 virtual String timeFormat() OVERRIDE; 59 virtual String timeFormat() override;
60 virtual String shortTimeFormat() OVERRIDE; 60 virtual String shortTimeFormat() override;
61 virtual String dateTimeFormatWithSeconds() OVERRIDE; 61 virtual String dateTimeFormatWithSeconds() override;
62 virtual String dateTimeFormatWithoutSeconds() OVERRIDE; 62 virtual String dateTimeFormatWithoutSeconds() override;
63 virtual const Vector<String>& monthLabels() OVERRIDE; 63 virtual const Vector<String>& monthLabels() override;
64 virtual const Vector<String>& shortMonthLabels() OVERRIDE; 64 virtual const Vector<String>& shortMonthLabels() override;
65 virtual const Vector<String>& standAloneMonthLabels() OVERRIDE; 65 virtual const Vector<String>& standAloneMonthLabels() override;
66 virtual const Vector<String>& shortStandAloneMonthLabels() OVERRIDE; 66 virtual const Vector<String>& shortStandAloneMonthLabels() override;
67 virtual const Vector<String>& timeAMPMLabels() OVERRIDE; 67 virtual const Vector<String>& timeAMPMLabels() override;
68 68
69 private: 69 private:
70 explicit LocaleMac(NSLocale*); 70 explicit LocaleMac(NSLocale*);
71 RetainPtr<NSDateFormatter> shortDateFormatter(); 71 RetainPtr<NSDateFormatter> shortDateFormatter();
72 virtual void initializeLocaleData() OVERRIDE; 72 virtual void initializeLocaleData() override;
73 73
74 RetainPtr<NSLocale> m_locale; 74 RetainPtr<NSLocale> m_locale;
75 RetainPtr<NSCalendar> m_gregorianCalendar; 75 RetainPtr<NSCalendar> m_gregorianCalendar;
76 Vector<String> m_weekDayShortLabels; 76 Vector<String> m_weekDayShortLabels;
77 Vector<String> m_monthLabels; 77 Vector<String> m_monthLabels;
78 RetainPtr<NSDateFormatter> timeFormatter(); 78 RetainPtr<NSDateFormatter> timeFormatter();
79 RetainPtr<NSDateFormatter> shortTimeFormatter(); 79 RetainPtr<NSDateFormatter> shortTimeFormatter();
80 RetainPtr<NSDateFormatter> dateTimeFormatterWithSeconds(); 80 RetainPtr<NSDateFormatter> dateTimeFormatterWithSeconds();
81 RetainPtr<NSDateFormatter> dateTimeFormatterWithoutSeconds(); 81 RetainPtr<NSDateFormatter> dateTimeFormatterWithoutSeconds();
82 82
83 String m_dateFormat; 83 String m_dateFormat;
84 String m_monthFormat; 84 String m_monthFormat;
85 String m_shortMonthFormat; 85 String m_shortMonthFormat;
86 String m_timeFormatWithSeconds; 86 String m_timeFormatWithSeconds;
87 String m_timeFormatWithoutSeconds; 87 String m_timeFormatWithoutSeconds;
88 String m_dateTimeFormatWithSeconds; 88 String m_dateTimeFormatWithSeconds;
89 String m_dateTimeFormatWithoutSeconds; 89 String m_dateTimeFormatWithoutSeconds;
90 Vector<String> m_shortMonthLabels; 90 Vector<String> m_shortMonthLabels;
91 Vector<String> m_standAloneMonthLabels; 91 Vector<String> m_standAloneMonthLabels;
92 Vector<String> m_shortStandAloneMonthLabels; 92 Vector<String> m_shortStandAloneMonthLabels;
93 Vector<String> m_timeAMPMLabels; 93 Vector<String> m_timeAMPMLabels;
94 bool m_didInitializeNumberData; 94 bool m_didInitializeNumberData;
95 }; 95 };
96 96
97 } // namespace blink 97 } // namespace blink
98 #endif 98 #endif
OLDNEW
« no previous file with comments | « Source/platform/text/LocaleICU.h ('k') | Source/platform/text/LocaleWin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698