[chromium] Plug-in failing to load shouldn't say "Missing Plug-in"
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Mar 2012 18:23:16 +0000 (18:23 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Mar 2012 18:23:16 +0000 (18:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=81907

Patch by Bernhard Bauer <bauerb@google.com> on 2012-03-22
Reviewed by Adam Barth.

Adding a MissingPluginText value to WebLocalizedString which can be used to override the "Missing Plug-in" message.

* public/platform/WebLocalizedString.h:
* src/LocalizedStrings.cpp:
(WebCore::missingPluginText):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111734 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/public/platform/WebLocalizedString.h
Source/WebKit/chromium/src/LocalizedStrings.cpp

index 88deac3..aa1f888 100644 (file)
@@ -1,3 +1,16 @@
+2012-03-22  Bernhard Bauer  <bauerb@google.com>
+
+        [chromium] Plug-in failing to load shouldn't say "Missing Plug-in"
+        https://bugs.webkit.org/show_bug.cgi?id=81907
+
+        Reviewed by Adam Barth.
+
+        Adding a MissingPluginText value to WebLocalizedString which can be used to override the "Missing Plug-in" message.
+
+        * public/platform/WebLocalizedString.h:
+        * src/LocalizedStrings.cpp:
+        (WebCore::missingPluginText):
+
 2012-03-22  Adrienne Walker  <enne@google.com>
 
         [chromium] Fix scrollbar layers holding onto invalid textures after lost context
index 0483df9..56fffc5 100644 (file)
@@ -35,46 +35,47 @@ namespace WebKit {
 
 struct WebLocalizedString {
     enum Name {
+        AXButtonActionVerb,
+        AXCheckedCheckBoxActionVerb,
+        AXHeadingText,
+        AXImageMapText,
+        AXLinkActionVerb,
+        AXLinkText,
+        AXListMarkerText,
+        AXRadioButtonActionVerb,
+        AXTextFieldActionVerb,
+        AXUncheckedCheckBoxActionVerb,
+        AXWebAreaText,
         DetailsLabel,
-        SubmitButtonDefaultLabel,
-        InputElementAltText,
-        ResetButtonDefaultLabel,
         FileButtonChooseFileLabel,
         FileButtonChooseMultipleFilesLabel,
         FileButtonNoFileSelectedLabel,
+        InputElementAltText,
+        KeygenMenuHighGradeKeySize,
+        KeygenMenuMediumGradeKeySize,
+        MissingPluginText,
         MultipleFileUploadText,
+        ResetButtonDefaultLabel,
         SearchableIndexIntroduction,
+        SearchMenuClearRecentSearchesText,
         SearchMenuNoRecentSearchesText,
         SearchMenuRecentSearchesText,
-        SearchMenuClearRecentSearchesText,
-        AXWebAreaText,
-        AXLinkText,
-        AXListMarkerText,
-        AXImageMapText,
-        AXHeadingText,
-        AXButtonActionVerb,
-        AXRadioButtonActionVerb,
-        AXTextFieldActionVerb,
-        AXCheckedCheckBoxActionVerb,
-        AXUncheckedCheckBoxActionVerb,
-        AXLinkActionVerb,
-        KeygenMenuHighGradeKeySize,
-        KeygenMenuMediumGradeKeySize,
+        SubmitButtonDefaultLabel,
+        ValidationPatternMismatch,
+        ValidationRangeOverflow,
+        ValidationRangeUnderflow,
+        ValidationStepMismatch,
+        ValidationTooLong,
+        ValidationTypeMismatch,
+        ValidationTypeMismatchForEmail,
+        ValidationTypeMismatchForMultipleEmail,
+        ValidationTypeMismatchForURL,
         ValidationValueMissing,
         ValidationValueMissingForCheckbox,
         ValidationValueMissingForFile,
         ValidationValueMissingForMultipleFile,
         ValidationValueMissingForRadio,
         ValidationValueMissingForSelect,
-        ValidationTypeMismatch,
-        ValidationTypeMismatchForEmail,
-        ValidationTypeMismatchForMultipleEmail,
-        ValidationTypeMismatchForURL,
-        ValidationPatternMismatch,
-        ValidationTooLong,
-        ValidationRangeUnderflow,
-        ValidationRangeOverflow,
-        ValidationStepMismatch,
     };
 };
 
index f4a91e4..7915571 100644 (file)
@@ -206,6 +206,9 @@ String AXMenuListActionVerb()
     
 String missingPluginText()
 {
+    String text = query(WebLocalizedString::MissingPluginText);
+    if (!text.isEmpty())
+        return text;
     notImplemented();
     return String("Missing Plug-in");
 }