Chromium Code Reviews| Index: content/renderer/renderer_date_time_picker.cc |
| diff --git a/content/renderer/renderer_date_time_picker.cc b/content/renderer/renderer_date_time_picker.cc |
| index 7d987b4085e6e1ec74436b2ed536e943c631b9b6..2e27b93a64986b8783e566009c94ca28adb29a71 100644 |
| --- a/content/renderer/renderer_date_time_picker.cc |
| +++ b/content/renderer/renderer_date_time_picker.cc |
| @@ -32,13 +32,18 @@ RendererDateTimePicker::~RendererDateTimePicker() { |
| bool RendererDateTimePicker::Open() { |
| DateTimeFormatter parser(chooser_params_); |
| ViewHostMsg_DateTimeDialogValue_Params message; |
| - message.year = parser.GetYear(); |
| - message.month = parser.GetMonth(); |
| - message.day = parser.GetDay(); |
| - message.hour = parser.GetHour(); |
| - message.minute = parser.GetMinute(); |
| - message.second = parser.GetSecond(); |
| message.dialog_type = parser.GetType(); |
| + if (message.dialog_type == ui::TEXT_INPUT_TYPE_WEEK) { |
| + message.year = parser.GetWeekYear(); |
| + message.week = parser.GetWeek(); |
| + } else { |
| + message.year = parser.GetYear(); |
| + message.month = parser.GetMonth(); |
|
palmer
2013/06/19 20:39:29
Nits: Use only 1 space.
|
| + message.day = parser.GetDay(); |
| + message.hour = parser.GetHour(); |
| + message.minute = parser.GetMinute(); |
| + message.second = parser.GetSecond(); |
| + } |
| message.minimum = chooser_params_.minimum; |
| message.maximum = chooser_params_.maximum; |
| Send(new ViewHostMsg_OpenDateTimeDialog(routing_id(), message)); |
| @@ -62,7 +67,7 @@ void RendererDateTimePicker::OnReplaceDateTime( |
| DateTimeFormatter formatter( |
| static_cast<ui::TextInputType>(value.dialog_type), |
| value.year, value.month, value.day, |
| - value.hour, value.minute, value.second); |
| + value.hour, value.minute, value.second, value.year, value.week); |
| if (chooser_completion_) |
| chooser_completion_->didChooseValue(WebString::fromUTF8( |