OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/renderer_date_time_picker.h" | 5 #include "content/renderer/renderer_date_time_picker.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "content/common/view_messages.h" | 8 #include "content/common/view_messages.h" |
9 #include "content/renderer/date_time_formatter.h" | 9 #include "content/renderer/date_time_formatter.h" |
10 #include "content/renderer/render_view_impl.h" | 10 #include "content/renderer/render_view_impl.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 DateTimeFormatter parser(chooser_params_); | 33 DateTimeFormatter parser(chooser_params_); |
34 std::string test_s = chooser_params_.currentValue.utf8(); | 34 std::string test_s = chooser_params_.currentValue.utf8(); |
35 | 35 |
36 ViewHostMsg_DateTimeDialogValue_Params message; | 36 ViewHostMsg_DateTimeDialogValue_Params message; |
37 message.year = parser.GetYear(); | 37 message.year = parser.GetYear(); |
38 message.month = parser.GetMonth(); | 38 message.month = parser.GetMonth(); |
39 message.day = parser.GetDay(); | 39 message.day = parser.GetDay(); |
40 message.hour = parser.GetHour(); | 40 message.hour = parser.GetHour(); |
41 message.minute = parser.GetMinute(); | 41 message.minute = parser.GetMinute(); |
42 message.second = parser.GetSecond(); | 42 message.second = parser.GetSecond(); |
| 43 message.week_year = parser.GetWeekYear(); |
| 44 message.week = parser.GetWeek(); |
43 message.dialog_type = parser.GetType(); | 45 message.dialog_type = parser.GetType(); |
44 | 46 |
45 Send(new ViewHostMsg_OpenDateTimeDialog(routing_id(), message)); | 47 Send(new ViewHostMsg_OpenDateTimeDialog(routing_id(), message)); |
46 return true; | 48 return true; |
47 } | 49 } |
48 | 50 |
49 bool RendererDateTimePicker::OnMessageReceived( | 51 bool RendererDateTimePicker::OnMessageReceived( |
50 const IPC::Message& message) { | 52 const IPC::Message& message) { |
51 bool handled = true; | 53 bool handled = true; |
52 IPC_BEGIN_MESSAGE_MAP(RendererDateTimePicker, message) | 54 IPC_BEGIN_MESSAGE_MAP(RendererDateTimePicker, message) |
53 IPC_MESSAGE_HANDLER(ViewMsg_ReplaceDateTime, OnReplaceDateTime) | 55 IPC_MESSAGE_HANDLER(ViewMsg_ReplaceDateTime, OnReplaceDateTime) |
54 IPC_MESSAGE_HANDLER(ViewMsg_CancelDateTimeDialog, OnCancel) | 56 IPC_MESSAGE_HANDLER(ViewMsg_CancelDateTimeDialog, OnCancel) |
55 IPC_MESSAGE_UNHANDLED(handled = false) | 57 IPC_MESSAGE_UNHANDLED(handled = false) |
56 IPC_END_MESSAGE_MAP() | 58 IPC_END_MESSAGE_MAP() |
57 return handled; | 59 return handled; |
58 } | 60 } |
59 | 61 |
60 void RendererDateTimePicker::OnReplaceDateTime( | 62 void RendererDateTimePicker::OnReplaceDateTime( |
61 const ViewHostMsg_DateTimeDialogValue_Params& value) { | 63 const ViewHostMsg_DateTimeDialogValue_Params& value) { |
62 | 64 |
63 DateTimeFormatter formatter( | 65 DateTimeFormatter formatter( |
64 static_cast<ui::TextInputType>(value.dialog_type), | 66 static_cast<ui::TextInputType>(value.dialog_type), |
65 value.year, value.month, value.day, | 67 value.year, value.month, value.day, |
66 value.hour, value.minute, value.second); | 68 value.hour, value.minute, value.second, |
| 69 value.week_year, value.week); |
67 | 70 |
68 if (chooser_completion_) | 71 if (chooser_completion_) |
69 chooser_completion_->didChooseValue(WebString::fromUTF8( | 72 chooser_completion_->didChooseValue(WebString::fromUTF8( |
70 formatter.GetFormattedValue().c_str())); | 73 formatter.GetFormattedValue().c_str())); |
71 } | 74 } |
72 | 75 |
73 void RendererDateTimePicker::OnCancel() { | 76 void RendererDateTimePicker::OnCancel() { |
74 if (chooser_completion_) | 77 if (chooser_completion_) |
75 chooser_completion_->didCancelChooser(); | 78 chooser_completion_->didCancelChooser(); |
76 } | 79 } |
77 | 80 |
78 } // namespace content | 81 } // namespace content |
OLD | NEW |