Index: webkit/glue/webkitclient_impl.cc |
=================================================================== |
--- webkit/glue/webkitclient_impl.cc (revision 66099) |
+++ webkit/glue/webkitclient_impl.cc (working copy) |
@@ -156,10 +156,26 @@ |
return IDS_KEYGEN_HIGH_GRADE_KEY; |
case WebLocalizedString::KeygenMenuMediumGradeKeySize: |
return IDS_KEYGEN_MED_GRADE_KEY; |
- // TODO(tkent): Remove default: when we merge the next |
- // WebLocalizedString.h change. |
- default: |
- break; |
+ case WebLocalizedString::ValidationValueMissing: |
+ return IDS_FORM_VALIDATION_VALUE_MISSING; |
+ case WebLocalizedString::ValidationTypeMismatch: |
+ return IDS_FORM_VALIDATION_TYPE_MISMATCH; |
+ case WebLocalizedString::ValidationTypeMismatchForEmail: |
+ return IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL; |
+ case WebLocalizedString::ValidationTypeMismatchForMultipleEmail: |
+ return IDS_FORM_VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL; |
+ case WebLocalizedString::ValidationTypeMismatchForURL: |
+ return IDS_FORM_VALIDATION_TYPE_MISMATCH_URL; |
+ case WebLocalizedString::ValidationPatternMismatch: |
+ return IDS_FORM_VALIDATION_PATTERN_MISMATCH; |
+ case WebLocalizedString::ValidationTooLong: |
+ return IDS_FORM_VALIDATION_TOO_LONG; |
+ case WebLocalizedString::ValidationRangeUnderflow: |
+ return IDS_FORM_VALIDATION_RANGE_UNDERFLOW; |
+ case WebLocalizedString::ValidationRangeOverflow: |
+ return IDS_FORM_VALIDATION_RANGE_OVERFLOW; |
+ case WebLocalizedString::ValidationStepMismatch: |
+ return IDS_FORM_VALIDATION_STEP_MISMATCH; |
} |
return -1; |
} |
@@ -319,6 +335,42 @@ |
NULL); |
} |
+WebString WebKitClientImpl::queryLocalizedString( |
+ WebLocalizedString::Name name, int value1, int value2) { |
tony
2010/11/16 18:11:41
Can this method just call the WebString, WebString
tkent
2010/11/22 10:19:06
Removed this function.
|
+ int message_id = ToMessageID(name); |
+ if (message_id < 0) |
+ return WebString(); |
+ std::vector<string16> values; |
+ values.reserve(2); |
+ values.push_back(base::IntToString16(value1)); |
+ values.push_back(base::IntToString16(value2)); |
+ return ReplaceStringPlaceholders( |
+ GetLocalizedString(message_id), values, NULL); |
+} |
+ |
+WebString WebKitClientImpl::queryLocalizedString( |
+ WebLocalizedString::Name name, const WebString& value) { |
+ int message_id = ToMessageID(name); |
+ if (message_id < 0) |
+ return WebString(); |
+ return ReplaceStringPlaceholders(GetLocalizedString(message_id), value, NULL); |
+} |
+ |
+WebString WebKitClientImpl::queryLocalizedString( |
+ WebLocalizedString::Name name, |
+ const WebString& value1, |
+ const WebString& value2) { |
+ int message_id = ToMessageID(name); |
+ if (message_id < 0) |
+ return WebString(); |
+ std::vector<string16> values; |
+ values.reserve(2); |
+ values.push_back(value1); |
+ values.push_back(value2); |
+ return ReplaceStringPlaceholders( |
+ GetLocalizedString(message_id), values, NULL); |
+} |
+ |
double WebKitClientImpl::currentTime() { |
return base::Time::Now().ToDoubleT(); |
} |