Add form validation message strings....

webkit/glue/webkitclient_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webkitclient_impl.h"
 
 #if defined(OS_LINUX)
 #include <malloc.h>
 #endif
 
@@ skipping 138 matching lines @@
     case WebLocalizedString::AXCheckedCheckBoxActionVerb:
       return IDS_AX_CHECKED_CHECK_BOX_ACTION_VERB;
     case WebLocalizedString::AXUncheckedCheckBoxActionVerb:
       return IDS_AX_UNCHECKED_CHECK_BOX_ACTION_VERB;
     case WebLocalizedString::AXLinkActionVerb:
       return IDS_AX_LINK_ACTION_VERB;
     case WebLocalizedString::KeygenMenuHighGradeKeySize:
       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;
 }
 
 WebKitClientImpl::WebKitClientImpl()
     : main_loop_(MessageLoop::current()),
       shared_timer_func_(NULL),
       shared_timer_fire_time_(0.0),
       shared_timer_suspended_(0) {
 }
@@ skipping 130 matching lines @@
 
 WebString WebKitClientImpl::queryLocalizedString(
     WebLocalizedString::Name name) {
   int message_id = ToMessageID(name);
   if (message_id < 0)
     return WebString();
   return GetLocalizedString(message_id);
 }
 
 WebString WebKitClientImpl::queryLocalizedString(
     WebLocalizedString::Name name, int numeric_value) {

[tony, 2010/11/16 18:11:41]

Can this method just convert numeric_value to a string and call
queryLocalizedString(name, WebString&)?

[tkent, 2010/11/22 10:19:06]

It's a good idea.
We should have
 - queryLocalizedString(Name)
 - queryLocalizedString(Name, const WebString&)
 - queryLocalizedString(Name, const WebString&, const WebString&)
and should remove queryLocalizedString(Name, int).  Integer->String conversion
should be done in WebKit APi layer.

   int message_id = ToMessageID(name);
   if (message_id < 0)
     return WebString();
   return ReplaceStringPlaceholders(GetLocalizedString(message_id),
                                    base::IntToString16(numeric_value),
                                    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, version?

[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();
 }
 
 void WebKitClientImpl::setSharedTimerFiredFunction(void (*func)()) {
   shared_timer_func_ = func;
 }
 
 void WebKitClientImpl::setSharedTimerFireTime(double fire_time) {
   shared_timer_fire_time_ = fire_time;
@@ skipping 127 matching lines @@
   ++shared_timer_suspended_;
 }
 
 void WebKitClientImpl::ResumeSharedTimer() {
   // The shared timer may have fired or been adjusted while we were suspended.
   if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
     setSharedTimerFireTime(shared_timer_fire_time_);
 }
 
 }  // namespace webkit_glue