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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/platform/text/LocaleWin.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/LocaleMac.h ('k') | Source/platform/text/PlatformLocale.cpp » ('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 25 matching lines...) Expand all
36 #include "wtf/Forward.h" 36 #include "wtf/Forward.h"
37 #include "wtf/Vector.h" 37 #include "wtf/Vector.h"
38 #include "wtf/text/WTFString.h" 38 #include "wtf/text/WTFString.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
42 class PLATFORM_EXPORT LocaleWin : public Locale { 42 class PLATFORM_EXPORT LocaleWin : public Locale {
43 public: 43 public:
44 static PassOwnPtr<LocaleWin> create(LCID, bool defaultsForLocale); 44 static PassOwnPtr<LocaleWin> create(LCID, bool defaultsForLocale);
45 ~LocaleWin(); 45 ~LocaleWin();
46 virtual const Vector<String>& weekDayShortLabels() OVERRIDE; 46 virtual const Vector<String>& weekDayShortLabels() override;
47 virtual unsigned firstDayOfWeek() OVERRIDE; 47 virtual unsigned firstDayOfWeek() override;
48 virtual bool isRTL() OVERRIDE; 48 virtual bool isRTL() override;
49 virtual String dateFormat() OVERRIDE; 49 virtual String dateFormat() override;
50 virtual String monthFormat() OVERRIDE; 50 virtual String monthFormat() override;
51 virtual String shortMonthFormat() OVERRIDE; 51 virtual String shortMonthFormat() override;
52 virtual String timeFormat() OVERRIDE; 52 virtual String timeFormat() override;
53 virtual String shortTimeFormat() OVERRIDE; 53 virtual String shortTimeFormat() override;
54 virtual String dateTimeFormatWithSeconds() OVERRIDE; 54 virtual String dateTimeFormatWithSeconds() override;
55 virtual String dateTimeFormatWithoutSeconds() OVERRIDE; 55 virtual String dateTimeFormatWithoutSeconds() override;
56 virtual const Vector<String>& monthLabels() OVERRIDE; 56 virtual const Vector<String>& monthLabels() override;
57 virtual const Vector<String>& shortMonthLabels() OVERRIDE; 57 virtual const Vector<String>& shortMonthLabels() override;
58 virtual const Vector<String>& standAloneMonthLabels() OVERRIDE; 58 virtual const Vector<String>& standAloneMonthLabels() override;
59 virtual const Vector<String>& shortStandAloneMonthLabels() OVERRIDE; 59 virtual const Vector<String>& shortStandAloneMonthLabels() override;
60 virtual const Vector<String>& timeAMPMLabels() OVERRIDE; 60 virtual const Vector<String>& timeAMPMLabels() override;
61 61
62 static String dateFormat(const String&); 62 static String dateFormat(const String&);
63 63
64 private: 64 private:
65 explicit LocaleWin(LCID, bool defaultsForLocale); 65 explicit LocaleWin(LCID, bool defaultsForLocale);
66 String getLocaleInfoString(LCTYPE); 66 String getLocaleInfoString(LCTYPE);
67 void getLocaleInfo(LCTYPE, DWORD&); 67 void getLocaleInfo(LCTYPE, DWORD&);
68 void ensureShortMonthLabels(); 68 void ensureShortMonthLabels();
69 void ensureMonthLabels(); 69 void ensureMonthLabels();
70 void ensureWeekDayShortLabels(); 70 void ensureWeekDayShortLabels();
71 // Locale function: 71 // Locale function:
72 virtual void initializeLocaleData() OVERRIDE; 72 virtual void initializeLocaleData() override;
73 73
74 LCID m_lcid; 74 LCID m_lcid;
75 Vector<String> m_shortMonthLabels; 75 Vector<String> m_shortMonthLabels;
76 Vector<String> m_monthLabels; 76 Vector<String> m_monthLabels;
77 String m_dateFormat; 77 String m_dateFormat;
78 String m_monthFormat; 78 String m_monthFormat;
79 String m_shortMonthFormat; 79 String m_shortMonthFormat;
80 String m_timeFormatWithSeconds; 80 String m_timeFormatWithSeconds;
81 String m_timeFormatWithoutSeconds; 81 String m_timeFormatWithoutSeconds;
82 String m_dateTimeFormatWithSeconds; 82 String m_dateTimeFormatWithSeconds;
83 String m_dateTimeFormatWithoutSeconds; 83 String m_dateTimeFormatWithoutSeconds;
84 Vector<String> m_timeAMPMLabels; 84 Vector<String> m_timeAMPMLabels;
85 Vector<String> m_weekDayShortLabels; 85 Vector<String> m_weekDayShortLabels;
86 unsigned m_firstDayOfWeek; 86 unsigned m_firstDayOfWeek;
87 bool m_didInitializeNumberData; 87 bool m_didInitializeNumberData;
88 bool m_defaultsForLocale; 88 bool m_defaultsForLocale;
89 }; 89 };
90 90
91 } // namespace blink 91 } // namespace blink
92 #endif 92 #endif
OLDNEW
« no previous file with comments | « Source/platform/text/LocaleMac.h ('k') | Source/platform/text/PlatformLocale.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698