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

Unified Diff: Source/platform/text/LocaleWin.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/LocaleWin.h
diff --git a/Source/platform/text/LocaleWin.h b/Source/platform/text/LocaleWin.h
index cf6badc376d2c78a762e2b07c4215cf217b284e8..e51010c21b63cc2a8f9173d75e0db669591f4c08 100644
--- a/Source/platform/text/LocaleWin.h
+++ b/Source/platform/text/LocaleWin.h
@@ -46,11 +46,9 @@ class PLATFORM_EXPORT LocaleWin : public Locale {
public:
static PassOwnPtr<LocaleWin> create(LCID, bool defaultsForLocale);
~LocaleWin();
-#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;
@@ -72,9 +70,7 @@ private:
void getLocaleInfo(LCTYPE, DWORD&);
void ensureShortMonthLabels();
void ensureMonthLabels();
-#if ENABLE(CALENDAR_PICKER)
void ensureWeekDayShortLabels();
-#endif
// Locale function:
virtual void initializeLocaleData() OVERRIDE;
@@ -89,10 +85,8 @@ private:
String m_dateTimeFormatWithSeconds;
String m_dateTimeFormatWithoutSeconds;
Vector<String> m_timeAMPMLabels;
-#if ENABLE(CALENDAR_PICKER)
Vector<String> m_weekDayShortLabels;
unsigned m_firstDayOfWeek;
-#endif
bool m_didInitializeNumberData;
bool m_defaultsForLocale;
};

Powered by Google App Engine
This is Rietveld 408576698