Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(425)

Unified Diff: content/browser/android/date_time_chooser_android.cc

Issue 15057004: Week picker for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/android/date_time_chooser_android.cc
diff --git a/content/browser/android/date_time_chooser_android.cc b/content/browser/android/date_time_chooser_android.cc
index 0a9a1e2172eef86eded70dd3a71da074d923dc2f..7f74477d10c98927ec8039390b116f9805945fef 100644
--- a/content/browser/android/date_time_chooser_android.cc
+++ b/content/browser/android/date_time_chooser_android.cc
@@ -24,7 +24,8 @@ 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 year, int month, int day, int hour, int minute, int second,
+ int week_year, int week);
void CancelDialog();
private:
@@ -38,7 +39,8 @@ DateTimeChooserAndroid::DateTimeIPCSender::DateTimeIPCSender(
void DateTimeChooserAndroid::DateTimeIPCSender::ReplaceDateTime(
int dialog_type,
- int year, int month, int day, int hour, int minute, int second) {
+ int year, int month, int day, int hour, int minute, int second,
+ int week_year, int week) {
ViewHostMsg_DateTimeDialogValue_Params value;
value.year = year;
value.month = month;
@@ -46,6 +48,8 @@ void DateTimeChooserAndroid::DateTimeIPCSender::ReplaceDateTime(
value.hour = hour;
value.minute = minute;
value.second = second;
+ value.week_year = week_year;
+ value.week = week;
value.dialog_type = dialog_type;
Send(new ViewMsg_ReplaceDateTime(routing_id(), value));
}
@@ -66,20 +70,21 @@ DateTimeChooserAndroid::~DateTimeChooserAndroid() {
void DateTimeChooserAndroid::InitializeDateInputTypes(
int text_input_type_date, int text_input_type_date_time,
int text_input_type_date_time_local, int text_input_type_month,
- int text_input_type_time) {
+ int text_input_type_time, int text_input_type_week) {
JNIEnv* env = AttachCurrentThread();
Java_DateTimeChooserAndroid_initializeDateInputTypes(
env,
text_input_type_date, text_input_type_date_time,
text_input_type_date_time_local, text_input_type_month,
- text_input_type_time);
+ 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 year, int month, int day, int hour, int minute, int second,
+ int weekYear, int week) {
sender_->ReplaceDateTime(
- dialog_type, year, month, day, hour, minute, second);
+ dialog_type, year, month, day, hour, minute, second, weekYear, week);
}
void DateTimeChooserAndroid::CancelDialog(JNIEnv* env, jobject) {
@@ -89,7 +94,8 @@ void DateTimeChooserAndroid::CancelDialog(JNIEnv* env, jobject) {
void DateTimeChooserAndroid::ShowDialog(
ContentViewCore* content, RenderViewHost* sender,
int type, int year, int month, int day,
- int hour, int minute, int second) {
+ int hour, int minute, int second,
+ int week_year, int week) {
if (sender_)
delete sender_;
sender_ = new DateTimeIPCSender(sender);
@@ -98,7 +104,7 @@ void DateTimeChooserAndroid::ShowDialog(
j_date_time_chooser_.Reset(Java_DateTimeChooserAndroid_createDateTimeChooser(
env, content->GetJavaObject().obj(),
reinterpret_cast<intptr_t>(this),
- type, year, month, day, hour, minute, second));
+ type, year, month, day, hour, minute, second, week_year, week));
}
// ----------------------------------------------------------------------------
@@ -112,7 +118,8 @@ bool RegisterDateTimeChooserAndroid(JNIEnv* env) {
ui::TEXT_INPUT_TYPE_DATE_TIME,
ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL,
ui::TEXT_INPUT_TYPE_MONTH,
- ui::TEXT_INPUT_TYPE_TIME);
+ ui::TEXT_INPUT_TYPE_TIME,
+ ui::TEXT_INPUT_TYPE_WEEK);
return registered;
}

Powered by Google App Engine
This is Rietveld 408576698