Transfer date/time value to chooser as double

content/renderer/renderer_date_time_picker.cc

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 074ebe5adaea622e11886289f912f89f7c7013e8..46f0c386af2040bccd73cfb523366ebe45895623 100644
--- a/content/renderer/renderer_date_time_picker.cc
+++ b/content/renderer/renderer_date_time_picker.cc
@@ -6,45 +6,47 @@
 
 #include "base/strings/string_util.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/date_time_formatter.h"
 #include "content/renderer/render_view_impl.h"
-
 #include "third_party/WebKit/public/web/WebDateTimeChooserCompletion.h"
 #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h"
 #include "third_party/WebKit/public/web/WebDateTimeInputType.h"
+#include "ui/base/ime/text_input_type.h"
 
 using blink::WebString;
 
 namespace content {
 
+COMPILE_ASSERT(int(blink::WebTextInputTypeDate) == \
+               int(ui::TEXT_INPUT_TYPE_DATE), mismatching_enum);
+COMPILE_ASSERT(int(blink::WebTextInputTypeDateTime) == \
+               int(ui::TEXT_INPUT_TYPE_DATE_TIME), mismatching_enum);
+COMPILE_ASSERT(int(blink::WebTextInputTypeDateTimeLocal) == \
+               int(ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL), mismatching_enum);
+COMPILE_ASSERT(int(blink::WebTextInputTypeMonth) == \
+               int(ui::TEXT_INPUT_TYPE_MONTH), mismatching_enum);
+COMPILE_ASSERT(int(blink::WebTextInputTypeTime) == \
+               int(ui::TEXT_INPUT_TYPE_TIME), mismatching_enum);
+COMPILE_ASSERT(int(blink::WebTextInputTypeWeek) == \
+               int(ui::TEXT_INPUT_TYPE_WEEK), mismatching_enum);
+COMPILE_ASSERT(int(blink::WebTextInputTypeDateTimeField) == \
+               int(ui::TEXT_INPUT_TYPE_DATE_TIME_FIELD), mismatching_enums);
+
 RendererDateTimePicker::RendererDateTimePicker(
     RenderViewImpl* sender,
     const blink::WebDateTimeChooserParams& params,
     blink::WebDateTimeChooserCompletion* completion)
     : RenderViewObserver(sender),
       chooser_params_(params),
-      chooser_completion_(completion){
+      chooser_completion_(completion) {
 }
 
 RendererDateTimePicker::~RendererDateTimePicker() {
 }
 
 bool RendererDateTimePicker::Open() {
-  DateTimeFormatter parser(chooser_params_);
   ViewHostMsg_DateTimeDialogValue_Params message;
-  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();
-    message.day = parser.GetDay();
-    message.hour = parser.GetHour();
-    message.minute = parser.GetMinute();
-    message.second = parser.GetSecond();
-    message.milli = parser.GetMilli();
-  }
+  message.dialog_type = static_cast<ui::TextInputType>(chooser_params_.type);
+  message.dialog_value = chooser_params_.doubleValue;
   message.minimum = chooser_params_.minimum;
   message.maximum = chooser_params_.maximum;
   message.step = chooser_params_.step;
@@ -63,28 +65,20 @@ bool RendererDateTimePicker::OnMessageReceived(
   return handled;
 }
 
-void RendererDateTimePicker::OnReplaceDateTime(
-    const ViewHostMsg_DateTimeDialogValue_Params& value) {
-
-  DateTimeFormatter formatter(static_cast<ui::TextInputType>(value.dialog_type),
-                              value.year,
-                              value.month,
-                              value.day,
-                              value.hour,
-                              value.minute,
-                              value.second,
-                              value.milli,
-                              value.year,
-                              value.week);
-
+void RendererDateTimePicker::OnReplaceDateTime(double value) {
   if (chooser_completion_)
-    chooser_completion_->didChooseValue(WebString::fromUTF8(
-        formatter.GetFormattedValue().c_str()));
+    chooser_completion_->didChooseValue(value);
+#if defined(OS_ANDROID)
+  static_cast<RenderViewImpl*>(render_view())->DismissDateTimeDialog();
+#endif
 }
 
 void RendererDateTimePicker::OnCancel() {
   if (chooser_completion_)
     chooser_completion_->didCancelChooser();
+#if defined(OS_ANDROID)
+  static_cast<RenderViewImpl*>(render_view())->DismissDateTimeDialog();
+#endif
 }
 
 }  // namespace content