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

Unified Diff: Source/platform/text/LocaleWin.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/LocaleWin.cpp
diff --git a/Source/platform/text/LocaleWin.cpp b/Source/platform/text/LocaleWin.cpp
index a32dd4cb4a1e7897b1f77df28422b29fb6efd736..13a941856cfd3b80ad3667944daa85efda2dae44 100644
--- a/Source/platform/text/LocaleWin.cpp
+++ b/Source/platform/text/LocaleWin.cpp
@@ -160,13 +160,11 @@ inline LocaleWin::LocaleWin(LCID lcid, bool defaultsForLocale)
, m_didInitializeNumberData(false)
, m_defaultsForLocale(defaultsForLocale)
{
-#if ENABLE(CALENDAR_PICKER)
DWORD value = 0;
getLocaleInfo(LOCALE_IFIRSTDAYOFWEEK | (defaultsForLocale ? LOCALE_NOUSEROVERRIDE : 0), value);
// 0:Monday, ..., 6:Sunday.
// We need 1 for Monday, 0 for Sunday.
m_firstDayOfWeek = (value + 1) % 7;
-#endif
}
PassOwnPtr<LocaleWin> LocaleWin::create(LCID lcid, bool defaultsForLocale)
@@ -395,7 +393,6 @@ const Vector<String>& LocaleWin::monthLabels()
return m_monthLabels;
}
-#if ENABLE(CALENDAR_PICKER)
const Vector<String>& LocaleWin::weekDayShortLabels()
{
ensureWeekDayShortLabels();
@@ -412,7 +409,6 @@ bool LocaleWin::isRTL()
WTF::Unicode::Direction dir = WTF::Unicode::direction(monthLabels()[0][0]);
return dir == WTF::Unicode::RightToLeft || dir == WTF::Unicode::RightToLeftArabic;
}
-#endif
String LocaleWin::dateFormat()
{

Powered by Google App Engine
This is Rietveld 408576698