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

Unified Diff: Source/platform/text/LocaleICU.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 side-by-side diff with in-line comments
Download patch
Index: Source/platform/text/LocaleICU.h
diff --git a/Source/platform/text/LocaleICU.h b/Source/platform/text/LocaleICU.h
index 60501345ed13f2863642fa3078fed2d17cc9bad1..e1d8a7b4b920bdaf5d1c395003323de2c0e47a3b 100644
--- a/Source/platform/text/LocaleICU.h
+++ b/Source/platform/text/LocaleICU.h
@@ -49,11 +49,9 @@ public:
static PassOwnPtr<LocaleICU> create(const char* localeString);
virtual ~LocaleICU();
-#if ENABLE(CALENDAR_PICKER)
virtual const Vector<String>& weekDayShortLabels() OVERRIDE;
virtual unsigned firstDayOfWeek() OVERRIDE;
virtual bool isRTL() OVERRIDE;
-#endif
virtual String dateFormat() OVERRIDE;
virtual String monthFormat() OVERRIDE;
virtual String shortMonthFormat() OVERRIDE;
@@ -79,9 +77,7 @@ private:
bool initializeShortDateFormat();
UDateFormat* openDateFormat(UDateFormatStyle timeStyle, UDateFormatStyle dateStyle) const;
-#if ENABLE(CALENDAR_PICKER)
void initializeCalendar();
-#endif
PassOwnPtr<Vector<String> > createLabelVector(const UDateFormat*, UDateFormatSymbolType, int32_t startIndex, int32_t size);
void initializeDateTimeFormat();
@@ -92,10 +88,8 @@ private:
bool m_didCreateDecimalFormat;
bool m_didCreateShortDateFormat;
-#if ENABLE(CALENDAR_PICKER)
OwnPtr<Vector<String> > m_weekDayShortLabels;
unsigned m_firstDayOfWeek;
-#endif
OwnPtr<Vector<String> > m_monthLabels;
String m_dateFormat;
String m_monthFormat;

Powered by Google App Engine
This is Rietveld 408576698