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

Unified Diff: Source/platform/text/LocaleICU.cpp

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.cpp
diff --git a/Source/platform/text/LocaleICU.cpp b/Source/platform/text/LocaleICU.cpp
index 4bb361b97e18b860cedcbb712a7e1c12be252097..a5985dc6b2eb893babb964e88b0d952f73850124 100644
--- a/Source/platform/text/LocaleICU.cpp
+++ b/Source/platform/text/LocaleICU.cpp
@@ -55,9 +55,7 @@ LocaleICU::LocaleICU(const char* locale)
, m_shortDateFormat(0)
, m_didCreateDecimalFormat(false)
, m_didCreateShortDateFormat(false)
-#if ENABLE(CALENDAR_PICKER)
, m_firstDayOfWeek(0)
-#endif
, m_mediumTimeFormat(0)
, m_shortTimeFormat(0)
, m_didCreateTimeFormat(false)
@@ -192,7 +190,6 @@ PassOwnPtr<Vector<String> > LocaleICU::createLabelVector(const UDateFormat* date
return labels.release();
}
-#if ENABLE(CALENDAR_PICKER)
static PassOwnPtr<Vector<String> > createFallbackWeekDayShortLabels()
{
OwnPtr<Vector<String> > labels = adoptPtr(new Vector<String>());
@@ -223,7 +220,6 @@ void LocaleICU::initializeCalendar()
if (!m_weekDayShortLabels)
m_weekDayShortLabels = createFallbackWeekDayShortLabels();
}
-#endif
static PassOwnPtr<Vector<String> > createFallbackMonthLabels()
{
@@ -247,7 +243,6 @@ const Vector<String>& LocaleICU::monthLabels()
return *m_monthLabels;
}
-#if ENABLE(CALENDAR_PICKER)
const Vector<String>& LocaleICU::weekDayShortLabels()
{
initializeCalendar();
@@ -265,7 +260,6 @@ bool LocaleICU::isRTL()
UErrorCode status = U_ZERO_ERROR;
return uloc_getCharacterOrientation(m_locale.data(), &status) == ULOC_LAYOUT_RTL;
}
-#endif
static PassOwnPtr<Vector<String> > createFallbackAMPMLabels()
{

Powered by Google App Engine
This is Rietveld 408576698