summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 11:33:52 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 11:33:52 +0000
commit27fb6a7230be656a15d75fa5b1975714983977ba (patch)
tree1b9fc234d9b39ffa0b1fb2166325dd5bac64aad5 /webkit
parent3f915fae62435f901f520286c7afeddb26644549 (diff)
downloadchromium_src-27fb6a7230be656a15d75fa5b1975714983977ba.zip
chromium_src-27fb6a7230be656a15d75fa5b1975714983977ba.tar.gz
chromium_src-27fb6a7230be656a15d75fa5b1975714983977ba.tar.bz2
Add a message for plug-in initialization errors.
TBR=darin@chromium.org BUG=119462 TEST=manual Review URL: http://codereview.chromium.org/9834020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkit_strings.grd6
-rw-r--r--webkit/glue/webkitplatformsupport_impl.cc110
2 files changed, 61 insertions, 55 deletions
diff --git a/webkit/glue/webkit_strings.grd b/webkit/glue/webkit_strings.grd
index e52e59b..c429f808 100644
--- a/webkit/glue/webkit_strings.grd
+++ b/webkit/glue/webkit_strings.grd
@@ -406,7 +406,11 @@ below:
<message name="IDS_PDF_PROGRESS_LOADING" desc="A message displayed on the progress control over PDF page during document loading.">
Loading
</message>
-
+
+ <message name="IDS_PLUGIN_INITIALIZATION_ERROR" desc="A message displayed when a plug-in failed to load">
+ Couldn't load plug-in.
+ </message>
+
</messages>
</release>
</grit>
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 16358ff..f6d4274 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -118,56 +118,76 @@ namespace webkit_glue {
static int ToMessageID(WebLocalizedString::Name name) {
switch (name) {
- case WebLocalizedString::SubmitButtonDefaultLabel:
- return IDS_FORM_SUBMIT_LABEL;
- case WebLocalizedString::InputElementAltText:
- return IDS_FORM_INPUT_ALT;
- case WebLocalizedString::ResetButtonDefaultLabel:
- return IDS_FORM_RESET_LABEL;
- case WebLocalizedString::FileButtonChooseFileLabel:
- return IDS_FORM_FILE_BUTTON_LABEL;
- case WebLocalizedString::FileButtonChooseMultipleFilesLabel:
- return IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL;
- case WebLocalizedString::FileButtonNoFileSelectedLabel:
- return IDS_FORM_FILE_NO_FILE_LABEL;
- case WebLocalizedString::MultipleFileUploadText:
- return IDS_FORM_FILE_MULTIPLE_UPLOAD;
- case WebLocalizedString::DetailsLabel:
- return IDS_DETAILS_WITHOUT_SUMMARY_LABEL;
- case WebLocalizedString::SearchableIndexIntroduction:
- return IDS_SEARCHABLE_INDEX_INTRO;
- case WebLocalizedString::SearchMenuNoRecentSearchesText:
- return IDS_RECENT_SEARCHES_NONE;
- case WebLocalizedString::SearchMenuRecentSearchesText:
- return IDS_RECENT_SEARCHES;
- case WebLocalizedString::SearchMenuClearRecentSearchesText:
- return IDS_RECENT_SEARCHES_CLEAR;
- case WebLocalizedString::AXWebAreaText:
- return IDS_AX_ROLE_WEB_AREA;
+ case WebLocalizedString::AXButtonActionVerb:
+ return IDS_AX_BUTTON_ACTION_VERB;
+ case WebLocalizedString::AXCheckedCheckBoxActionVerb:
+ return IDS_AX_CHECKED_CHECK_BOX_ACTION_VERB;
+ case WebLocalizedString::AXHeadingText:
+ return IDS_AX_ROLE_HEADING;
+ case WebLocalizedString::AXImageMapText:
+ return IDS_AX_ROLE_IMAGE_MAP;
+ case WebLocalizedString::AXLinkActionVerb:
+ return IDS_AX_LINK_ACTION_VERB;
case WebLocalizedString::AXLinkText:
return IDS_AX_ROLE_LINK;
case WebLocalizedString::AXListMarkerText:
return IDS_AX_ROLE_LIST_MARKER;
- case WebLocalizedString::AXImageMapText:
- return IDS_AX_ROLE_IMAGE_MAP;
- case WebLocalizedString::AXHeadingText:
- return IDS_AX_ROLE_HEADING;
- case WebLocalizedString::AXButtonActionVerb:
- return IDS_AX_BUTTON_ACTION_VERB;
case WebLocalizedString::AXRadioButtonActionVerb:
return IDS_AX_RADIO_BUTTON_ACTION_VERB;
case WebLocalizedString::AXTextFieldActionVerb:
return IDS_AX_TEXT_FIELD_ACTION_VERB;
- 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::AXWebAreaText:
+ return IDS_AX_ROLE_WEB_AREA;
+ case WebLocalizedString::DetailsLabel:
+ return IDS_DETAILS_WITHOUT_SUMMARY_LABEL;
+ case WebLocalizedString::FileButtonChooseFileLabel:
+ return IDS_FORM_FILE_BUTTON_LABEL;
+ case WebLocalizedString::FileButtonChooseMultipleFilesLabel:
+ return IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL;
+ case WebLocalizedString::FileButtonNoFileSelectedLabel:
+ return IDS_FORM_FILE_NO_FILE_LABEL;
+ case WebLocalizedString::InputElementAltText:
+ return IDS_FORM_INPUT_ALT;
case WebLocalizedString::KeygenMenuHighGradeKeySize:
return IDS_KEYGEN_HIGH_GRADE_KEY;
case WebLocalizedString::KeygenMenuMediumGradeKeySize:
return IDS_KEYGEN_MED_GRADE_KEY;
+ case WebLocalizedString::MissingPluginText:
+ return IDS_PLUGIN_INITIALIZATION_ERROR;
+ case WebLocalizedString::MultipleFileUploadText:
+ return IDS_FORM_FILE_MULTIPLE_UPLOAD;
+ case WebLocalizedString::ResetButtonDefaultLabel:
+ return IDS_FORM_RESET_LABEL;
+ case WebLocalizedString::SearchableIndexIntroduction:
+ return IDS_SEARCHABLE_INDEX_INTRO;
+ case WebLocalizedString::SearchMenuClearRecentSearchesText:
+ return IDS_RECENT_SEARCHES_CLEAR;
+ case WebLocalizedString::SearchMenuNoRecentSearchesText:
+ return IDS_RECENT_SEARCHES_NONE;
+ case WebLocalizedString::SearchMenuRecentSearchesText:
+ return IDS_RECENT_SEARCHES;
+ case WebLocalizedString::SubmitButtonDefaultLabel:
+ return IDS_FORM_SUBMIT_LABEL;
+ case WebLocalizedString::ValidationPatternMismatch:
+ return IDS_FORM_VALIDATION_PATTERN_MISMATCH;
+ case WebLocalizedString::ValidationRangeOverflow:
+ return IDS_FORM_VALIDATION_RANGE_OVERFLOW;
+ case WebLocalizedString::ValidationRangeUnderflow:
+ return IDS_FORM_VALIDATION_RANGE_UNDERFLOW;
+ case WebLocalizedString::ValidationStepMismatch:
+ return IDS_FORM_VALIDATION_STEP_MISMATCH;
+ case WebLocalizedString::ValidationTooLong:
+ return IDS_FORM_VALIDATION_TOO_LONG;
+ 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::ValidationValueMissing:
return IDS_FORM_VALIDATION_VALUE_MISSING;
case WebLocalizedString::ValidationValueMissingForCheckbox:
@@ -180,24 +200,6 @@ static int ToMessageID(WebLocalizedString::Name name) {
return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO;
case WebLocalizedString::ValidationValueMissingForSelect:
return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT;
- 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;
// This "default:" line exists to avoid compile warnings about enum
// coverage when we add a new symbol to WebLocalizedString.h in WebKit.
// After a planned WebKit patch is landed, we need to add a case statement