Source/platform/text/LocaleMac.h - Issue 52553008: Eliminate the CALENDAR_PICKER compile time flag as only android uses this flag and the web facing p…

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

Issue 52553008: Eliminate the CALENDAR_PICKER compile time flag as only android uses this flag and the web facing p… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master

Patch Set: Fix winbot by eliminating last checks for CALENDAR_PICKER Created 7 years, 1 month 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

OLD	NEW
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 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 namespace WebCore {	44 namespace WebCore {

45	45

46 class DateComponents;	46 class DateComponents;

47	47

48 class PLATFORM_EXPORT LocaleMac : public Locale {	48 class PLATFORM_EXPORT LocaleMac : public Locale {

49 public:	49 public:

50 static PassOwnPtr<LocaleMac> create(const String&);	50 static PassOwnPtr<LocaleMac> create(const String&);

51 static PassOwnPtr<LocaleMac> create(NSLocale*);	51 static PassOwnPtr<LocaleMac> create(NSLocale*);

52 ~LocaleMac();	52 ~LocaleMac();

53	53

54 #if ENABLE(CALENDAR_PICKER)

55 virtual const Vector<String>& weekDayShortLabels() OVERRIDE;	54 virtual const Vector<String>& weekDayShortLabels() OVERRIDE;

56 virtual unsigned firstDayOfWeek() OVERRIDE;	55 virtual unsigned firstDayOfWeek() OVERRIDE;

57 virtual bool isRTL() OVERRIDE;	56 virtual bool isRTL() OVERRIDE;

58 #endif

59	57

60 virtual String dateFormat() OVERRIDE;	58 virtual String dateFormat() OVERRIDE;

61 virtual String monthFormat() OVERRIDE;	59 virtual String monthFormat() OVERRIDE;

62 virtual String shortMonthFormat() OVERRIDE;	60 virtual String shortMonthFormat() OVERRIDE;

63 virtual String timeFormat() OVERRIDE;	61 virtual String timeFormat() OVERRIDE;

64 virtual String shortTimeFormat() OVERRIDE;	62 virtual String shortTimeFormat() OVERRIDE;

65 virtual String dateTimeFormatWithSeconds() OVERRIDE;	63 virtual String dateTimeFormatWithSeconds() OVERRIDE;

66 virtual String dateTimeFormatWithoutSeconds() OVERRIDE;	64 virtual String dateTimeFormatWithoutSeconds() OVERRIDE;

67 virtual const Vector<String>& monthLabels() OVERRIDE;	65 virtual const Vector<String>& monthLabels() OVERRIDE;

68 virtual const Vector<String>& shortMonthLabels() OVERRIDE;	66 virtual const Vector<String>& shortMonthLabels() OVERRIDE;

69 virtual const Vector<String>& standAloneMonthLabels() OVERRIDE;	67 virtual const Vector<String>& standAloneMonthLabels() OVERRIDE;

70 virtual const Vector<String>& shortStandAloneMonthLabels() OVERRIDE;	68 virtual const Vector<String>& shortStandAloneMonthLabels() OVERRIDE;

71 virtual const Vector<String>& timeAMPMLabels() OVERRIDE;	69 virtual const Vector<String>& timeAMPMLabels() OVERRIDE;

72	70

73 private:	71 private:

74 explicit LocaleMac(NSLocale*);	72 explicit LocaleMac(NSLocale*);

75 RetainPtr<NSDateFormatter> shortDateFormatter();	73 RetainPtr<NSDateFormatter> shortDateFormatter();

76 virtual void initializeLocaleData() OVERRIDE;	74 virtual void initializeLocaleData() OVERRIDE;

77	75

78 RetainPtr<NSLocale> m_locale;	76 RetainPtr<NSLocale> m_locale;

79 RetainPtr<NSCalendar> m_gregorianCalendar;	77 RetainPtr<NSCalendar> m_gregorianCalendar;

80 #if ENABLE(CALENDAR_PICKER)

81 Vector<String> m_weekDayShortLabels;	78 Vector<String> m_weekDayShortLabels;

82 #endif

83 Vector<String> m_monthLabels;	79 Vector<String> m_monthLabels;

84 RetainPtr<NSDateFormatter> timeFormatter();	80 RetainPtr<NSDateFormatter> timeFormatter();

85 RetainPtr<NSDateFormatter> shortTimeFormatter();	81 RetainPtr<NSDateFormatter> shortTimeFormatter();

86 RetainPtr<NSDateFormatter> dateTimeFormatterWithSeconds();	82 RetainPtr<NSDateFormatter> dateTimeFormatterWithSeconds();

87 RetainPtr<NSDateFormatter> dateTimeFormatterWithoutSeconds();	83 RetainPtr<NSDateFormatter> dateTimeFormatterWithoutSeconds();

88	84

89 String m_dateFormat;	85 String m_dateFormat;

90 String m_monthFormat;	86 String m_monthFormat;

91 String m_shortMonthFormat;	87 String m_shortMonthFormat;

92 String m_timeFormatWithSeconds;	88 String m_timeFormatWithSeconds;

93 String m_timeFormatWithoutSeconds;	89 String m_timeFormatWithoutSeconds;

94 String m_dateTimeFormatWithSeconds;	90 String m_dateTimeFormatWithSeconds;

95 String m_dateTimeFormatWithoutSeconds;	91 String m_dateTimeFormatWithoutSeconds;

96 Vector<String> m_shortMonthLabels;	92 Vector<String> m_shortMonthLabels;

97 Vector<String> m_standAloneMonthLabels;	93 Vector<String> m_standAloneMonthLabels;

98 Vector<String> m_shortStandAloneMonthLabels;	94 Vector<String> m_shortStandAloneMonthLabels;

99 Vector<String> m_timeAMPMLabels;	95 Vector<String> m_timeAMPMLabels;

100 bool m_didInitializeNumberData;	96 bool m_didInitializeNumberData;

101 };	97 };

102	98

103 } // namespace WebCore	99 } // namespace WebCore

104 #endif	100 #endif

OLD	NEW

« no previous file with comments | « Source/platform/text/LocaleICU.cpp ('k') | Source/platform/text/LocaleMac.mm » ('j') | Source/web/web.gyp » ('J')