diff options
author | anton@chromium.org <anton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 14:59:09 +0000 |
---|---|---|
committer | anton@chromium.org <anton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 14:59:09 +0000 |
commit | ee59cbecde3b8b22c15609f51528173482a819df (patch) | |
tree | 65dc6d5cb1801898fe65ae6fa09527816c18dab7 /content/browser/android/date_time_chooser_android.cc | |
parent | b54de4ef76ec4b8e5ab7f9121a09b98adb92f088 (diff) | |
download | chromium_src-ee59cbecde3b8b22c15609f51528173482a819df.zip chromium_src-ee59cbecde3b8b22c15609f51528173482a819df.tar.gz chromium_src-ee59cbecde3b8b22c15609f51528173482a819df.tar.bz2 |
Support for seconds and milliseconds in the time input dialog.
C++ reformatting by "git cl format".
Previously LGTM in https://codereview.chromium.org/21907003/
TBR=jochen,bulach,palmer
BUG=164563
TEST=RendererDateTimePickerTest.*
Review URL: https://chromiumcodereview.appspot.com/22921005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android/date_time_chooser_android.cc')
-rw-r--r-- | content/browser/android/date_time_chooser_android.cc | 72 |
1 files changed, 58 insertions, 14 deletions
diff --git a/content/browser/android/date_time_chooser_android.cc b/content/browser/android/date_time_chooser_android.cc index 0c3ba2d..7c91ff0 100644 --- a/content/browser/android/date_time_chooser_android.cc +++ b/content/browser/android/date_time_chooser_android.cc @@ -24,7 +24,14 @@ class DateTimeChooserAndroid::DateTimeIPCSender : explicit DateTimeIPCSender(RenderViewHost* sender); virtual ~DateTimeIPCSender() {} void ReplaceDateTime(int dialog_type, - int year, int month, int day, int hour, int minute, int second, int week); + int year, + int month, + int day, + int hour, + int minute, + int second, + int milli, + int week); void CancelDialog(); private: @@ -36,9 +43,15 @@ DateTimeChooserAndroid::DateTimeIPCSender::DateTimeIPCSender( : RenderViewHostObserver(sender) { } -void DateTimeChooserAndroid::DateTimeIPCSender::ReplaceDateTime( - int dialog_type, - int year, int month, int day, int hour, int minute, int second, int week) { +void DateTimeChooserAndroid::DateTimeIPCSender::ReplaceDateTime(int dialog_type, + int year, + int month, + int day, + int hour, + int minute, + int second, + int milli, + int week) { ViewHostMsg_DateTimeDialogValue_Params value; value.year = year; value.month = month; @@ -46,6 +59,7 @@ void DateTimeChooserAndroid::DateTimeIPCSender::ReplaceDateTime( value.hour = hour; value.minute = minute; value.second = second; + value.milli = milli; value.week = week; value.dialog_type = dialog_type; Send(new ViewMsg_ReplaceDateTime(routing_id(), value)); @@ -76,30 +90,60 @@ void DateTimeChooserAndroid::InitializeDateInputTypes( text_input_type_time, text_input_type_week); } -void DateTimeChooserAndroid::ReplaceDateTime( - JNIEnv* env, jobject, int dialog_type, - int year, int month, int day, int hour, int minute, int second, int week) { +void DateTimeChooserAndroid::ReplaceDateTime(JNIEnv* env, + jobject, + int dialog_type, + int year, + int month, + int day, + int hour, + int minute, + int second, + int milli, + int week) { sender_->ReplaceDateTime( - dialog_type, year, month, day, hour, minute, second, week); + dialog_type, year, month, day, hour, minute, second, milli, week); } void DateTimeChooserAndroid::CancelDialog(JNIEnv* env, jobject) { sender_->CancelDialog(); } -void DateTimeChooserAndroid::ShowDialog( - ContentViewCore* content, RenderViewHost* sender, - int type, int year, int month, int day, - int hour, int minute, int second, int week, double min, double max) { +void DateTimeChooserAndroid::ShowDialog(ContentViewCore* content, + RenderViewHost* sender, + int type, + int year, + int month, + int day, + int hour, + int minute, + int second, + int milli, + int week, + double min, + double max, + double step) { if (sender_) delete sender_; sender_ = new DateTimeIPCSender(sender); JNIEnv* env = AttachCurrentThread(); j_date_time_chooser_.Reset(Java_DateTimeChooserAndroid_createDateTimeChooser( - env, content->GetJavaObject().obj(), + env, + content->GetJavaObject().obj(), reinterpret_cast<intptr_t>(this), - type, year, month, day, hour, minute, second, week, min, max)); + type, + year, + month, + day, + hour, + minute, + second, + milli, + week, + min, + max, + step)); } // ---------------------------------------------------------------------------- |