Source/WebKit/chromium/src/DateTimeChooserImpl.cpp - Issue 12082066: Merge 140778

Side by Side Diff: Source/WebKit/chromium/src/DateTimeChooserImpl.cpp

Issue 12082066: Merge 140778 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 106 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
117 } else if (m_parameters.type == WebCore::InputTypeNames::week()) {	117 } else if (m_parameters.type == WebCore::InputTypeNames::week()) {

118 todayLabelString = Platform::current()->queryLocalizedString(WebLocalize dString::ThisWeekButtonLabel);	118 todayLabelString = Platform::current()->queryLocalizedString(WebLocalize dString::ThisWeekButtonLabel);

119 otherDateLabelString = Platform::current()->queryLocalizedString(WebLoca lizedString::OtherWeekLabel);	119 otherDateLabelString = Platform::current()->queryLocalizedString(WebLoca lizedString::OtherWeekLabel);

120 } else {	120 } else {

121 todayLabelString = Platform::current()->queryLocalizedString(WebLocalize dString::CalendarToday);	121 todayLabelString = Platform::current()->queryLocalizedString(WebLocalize dString::CalendarToday);

122 otherDateLabelString = Platform::current()->queryLocalizedString(WebLoca lizedString::OtherDateLabel);	122 otherDateLabelString = Platform::current()->queryLocalizedString(WebLoca lizedString::OtherDateLabel);

123 }	123 }

124	124

125 addString("<!DOCTYPE html><head><meta charset='UTF-8'><style>\n", writer);	125 addString("<!DOCTYPE html><head><meta charset='UTF-8'><style>\n", writer);

126 writer.addData(WebCore::pickerCommonCss, sizeof(WebCore::pickerCommonCss));	126 writer.addData(WebCore::pickerCommonCss, sizeof(WebCore::pickerCommonCss));

	127 writer.addData(WebCore::pickerCommonChromiumCss, sizeof(WebCore::pickerCommo nChromiumCss));

127 writer.addData(WebCore::suggestionPickerCss, sizeof(WebCore::suggestionPicke rCss));	128 writer.addData(WebCore::suggestionPickerCss, sizeof(WebCore::suggestionPicke rCss));

128 writer.addData(WebCore::calendarPickerCss, sizeof(WebCore::calendarPickerCss ));	129 writer.addData(WebCore::calendarPickerCss, sizeof(WebCore::calendarPickerCss ));

129 CString extraStyle = WebCore::RenderTheme::defaultTheme()->extraCalendarPick erStyleSheet();	130 writer.addData(WebCore::calendarPickerChromiumCss, sizeof(WebCore::calendarP ickerChromiumCss));

130 if (extraStyle.length())

131 writer.addData(extraStyle.data(), extraStyle.length());

132 addString("</style></head><body><div id=main>Loading...</div><script>\n"	131 addString("</style></head><body><div id=main>Loading...</div><script>\n"

133 "window.dialogArguments = {\n", writer);	132 "window.dialogArguments = {\n", writer);

134 addProperty("anchorRectInScreen", anchorRectInScreen, writer);	133 addProperty("anchorRectInScreen", anchorRectInScreen, writer);

135 addProperty("rootViewRectInScreen", rootViewRectInScreen, writer);	134 addProperty("rootViewRectInScreen", rootViewRectInScreen, writer);

136 #if OS(MAC_OS_X)	135 #if OS(MAC_OS_X)

137 addProperty("confineToRootView", true, writer);	136 addProperty("confineToRootView", true, writer);

138 #else	137 #else

139 addProperty("confineToRootView", false, writer);	138 addProperty("confineToRootView", false, writer);

140 #endif	139 #endif

141 addProperty("min", minDate.toString(), writer);	140 addProperty("min", minDate.toString(), writer);

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
187 void DateTimeChooserImpl::didClosePopup()	186 void DateTimeChooserImpl::didClosePopup()

188 {	187 {

189 ASSERT(m_client);	188 ASSERT(m_client);

190 m_popup = 0;	189 m_popup = 0;

191 m_client->didEndChooser();	190 m_client->didEndChooser();

192 }	191 }

193	192

194 } // namespace WebKit	193 } // namespace WebKit

195	194

196 #endif // ENABLE(INPUT_MULTIPLE_FIELDS_UI)	195 #endif // ENABLE(INPUT_MULTIPLE_FIELDS_UI)

OLD	NEW

« no previous file with comments | « Source/WebCore/rendering/RenderThemeChromiumMac.mm ('k') | no next file » | no next file with comments »