Change the return type of GetOverflowStringName()

As a step to remove all uses of WebLocalizedString::kFooBar,
this CL changes the return type of GetOverflowStringName()
from WebLocalizedString::Name to int.

In addition, this CL renames GetOverflowStringName() with
GetOverflowStringId() according to the return type is changed.

As changing the return type, this CL replaces below ones with
matched IDS_FOO.

  - kAXAMPMFieldText
  - kOverflowMenuCaptions,
  - kOverflowMenuCast,
  - kOverflowMenuEnterFullscreen,
  - kOverflowMenuExitFullscreen,
  - kOverflowMenuMute,
  - kOverflowMenuPlay,
  - kOverflowMenuPause,
  - kOverflowMenuDownload,
  - kOverflowMenuEnterPictureInPicture,
  - kOverflowMenuExitPictureInPicture,

Bug: 995644
Change-Id: I0347751c8df31fb18e88f65e0024f1e4ec94b217
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1819285
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Tommy Steimel <steimel@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699571}

content/child/blink_platform_impl.cc

@@ -90,8 +90,6 @@ std::unique_ptr<blink::WebThemeEngine> GetWebThemeEngine() {
 
 int ToMessageID(int resource_id) {
   switch (resource_id) {
-    case WebLocalizedString::kAXAMPMFieldText:
-      return IDS_AX_AM_PM_FIELD_TEXT;
     case WebLocalizedString::kAXDayOfMonthFieldText:
       return IDS_AX_DAY_OF_MONTH_FIELD_TEXT;
     case WebLocalizedString::kAXHourFieldText:
@@ -194,30 +192,10 @@ int ToMessageID(int resource_id) {
       return IDS_FORM_OTHER_MONTH_LABEL;
     case WebLocalizedString::kOtherWeekLabel:
       return IDS_FORM_OTHER_WEEK_LABEL;
-    case WebLocalizedString::kOverflowMenuCaptions:
-      return IDS_MEDIA_OVERFLOW_MENU_CLOSED_CAPTIONS;
     case WebLocalizedString::kOverflowMenuCaptionsSubmenuTitle:
       return IDS_MEDIA_OVERFLOW_MENU_CLOSED_CAPTIONS_SUBMENU_TITLE;
-    case WebLocalizedString::kOverflowMenuCast:
-      return IDS_MEDIA_OVERFLOW_MENU_CAST;
-    case WebLocalizedString::kOverflowMenuEnterFullscreen:
-      return IDS_MEDIA_OVERFLOW_MENU_ENTER_FULLSCREEN;
-    case WebLocalizedString::kOverflowMenuExitFullscreen:
-      return IDS_MEDIA_OVERFLOW_MENU_EXIT_FULLSCREEN;
-    case WebLocalizedString::kOverflowMenuMute:
-      return IDS_MEDIA_OVERFLOW_MENU_MUTE;
     case WebLocalizedString::kOverflowMenuUnmute:
       return IDS_MEDIA_OVERFLOW_MENU_UNMUTE;
-    case WebLocalizedString::kOverflowMenuPlay:
-      return IDS_MEDIA_OVERFLOW_MENU_PLAY;
-    case WebLocalizedString::kOverflowMenuPause:
-      return IDS_MEDIA_OVERFLOW_MENU_PAUSE;
-    case WebLocalizedString::kOverflowMenuDownload:
-      return IDS_MEDIA_OVERFLOW_MENU_DOWNLOAD;
-    case WebLocalizedString::kOverflowMenuEnterPictureInPicture:
-      return IDS_MEDIA_OVERFLOW_MENU_ENTER_PICTURE_IN_PICTURE;
-    case WebLocalizedString::kOverflowMenuExitPictureInPicture:
-      return IDS_MEDIA_OVERFLOW_MENU_EXIT_PICTURE_IN_PICTURE;
     case WebLocalizedString::kPictureInPictureInterstitialText:
       return IDS_MEDIA_PICTURE_IN_PICTURE_INTERSTITIAL_TEXT;
     case WebLocalizedString::kPlaceholderForDayOfMonthField:

third_party/blink/public/platform/web_localized_string.h

@@ -35,7 +35,6 @@ namespace blink {
 
 struct WebLocalizedString {
   enum Name {
-    kAXAMPMFieldText,
     kAXDayOfMonthFieldText,
     kAXHourFieldText,
     kAXMediaAudioElement,
@@ -88,18 +87,8 @@ struct WebLocalizedString {
     kOtherDateLabel,
     kOtherMonthLabel,
     kOtherWeekLabel,
-    kOverflowMenuCaptions,
     kOverflowMenuCaptionsSubmenuTitle,
-    kOverflowMenuCast,
-    kOverflowMenuEnterFullscreen,
-    kOverflowMenuExitFullscreen,
-    kOverflowMenuMute,
     kOverflowMenuUnmute,
-    kOverflowMenuPlay,
-    kOverflowMenuPause,
-    kOverflowMenuDownload,
-    kOverflowMenuEnterPictureInPicture,
-    kOverflowMenuExitPictureInPicture,
     kPictureInPictureInterstitialText,
     // kPlaceholderForDayOfMonthField is for day placeholder text, e.g.
     // "dd", for date field used in multiple fields "date", "datetime", and

third_party/blink/renderer/core/html/forms/date_time_field_elements.cc

@@ -46,7 +46,7 @@ DateTimeAMPMFieldElement::DateTimeAMPMFieldElement(
     : DateTimeSymbolicFieldElement(document, field_owner, ampm_labels, 0, 1) {
   DEFINE_STATIC_LOCAL(AtomicString, ampm_pseudo_id,
                       ("-webkit-datetime-edit-ampm-field"));
-  Initialize(ampm_pseudo_id, QueryString(WebLocalizedString::kAXAMPMFieldText));
+  Initialize(ampm_pseudo_id, QueryString(IDS_AX_AM_PM_FIELD_TEXT));
 }
 
 void DateTimeAMPMFieldElement::PopulateDateTimeFieldsState(

third_party/blink/renderer/modules/media_controls/elements/media_control_cast_button_element.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/modules/media_controls/elements/media_control_cast_button_element.h"
 
 #include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
 #include "third_party/blink/renderer/core/geometry/dom_rect.h"
@@ -73,9 +74,8 @@ bool MediaControlCastButtonElement::WillRespondToMouseClickEvents() {
   return true;
 }
 
-WebLocalizedString::Name MediaControlCastButtonElement::GetOverflowStringName()
-    const {
-  return WebLocalizedString::kOverflowMenuCast;
+int MediaControlCastButtonElement::GetOverflowStringId() const {
+  return IDS_MEDIA_OVERFLOW_MENU_CAST;
 }
 
 bool MediaControlCastButtonElement::HasOverflowButton() const {

third_party/blink/renderer/modules/media_controls/elements/media_control_cast_button_element.h

@@ -26,7 +26,7 @@ class MediaControlCastButtonElement final : public MediaControlInputElement {
 
   // MediaControlInputElement overrides.
   bool WillRespondToMouseClickEvents() final;
-  WebLocalizedString::Name GetOverflowStringName() const final;
+  int GetOverflowStringId() const final;
   bool HasOverflowButton() const final;
 
  protected:

third_party/blink/renderer/modules/media_controls/elements/media_control_download_button_element.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/modules/media_controls/elements/media_control_download_button_element.h"
 
 #include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
 #include "third_party/blink/renderer/core/frame/local_frame_client.h"
 #include "third_party/blink/renderer/core/frame/settings.h"
@@ -46,9 +47,8 @@ bool MediaControlDownloadButtonElement::ShouldDisplayDownloadButton() const {
   return true;
 }
 
-WebLocalizedString::Name
-MediaControlDownloadButtonElement::GetOverflowStringName() const {
-  return WebLocalizedString::kOverflowMenuDownload;
+int MediaControlDownloadButtonElement::GetOverflowStringId() const {
+  return IDS_MEDIA_OVERFLOW_MENU_DOWNLOAD;
 }
 
 bool MediaControlDownloadButtonElement::HasOverflowButton() const {

third_party/blink/renderer/modules/media_controls/elements/media_control_download_button_element.h

@@ -23,7 +23,7 @@ class MediaControlDownloadButtonElement final
 
   // MediaControlInputElement overrides.
   // TODO(mlamouri): add WillRespondToMouseClickEvents
-  WebLocalizedString::Name GetOverflowStringName() const final;
+  int GetOverflowStringId() const final;
   bool HasOverflowButton() const final;
   bool IsControlPanelButton() const final;
 

third_party/blink/renderer/modules/media_controls/elements/media_control_fullscreen_button_element.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/modules/media_controls/elements/media_control_fullscreen_button_element.h"
 
 #include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
 #include "third_party/blink/renderer/core/frame/settings.h"
@@ -41,11 +42,10 @@ bool MediaControlFullscreenButtonElement::WillRespondToMouseClickEvents() {
   return true;
 }
 
-WebLocalizedString::Name
-MediaControlFullscreenButtonElement::GetOverflowStringName() const {
+int MediaControlFullscreenButtonElement::GetOverflowStringId() const {
   if (MediaElement().IsFullscreen())
-    return WebLocalizedString::kOverflowMenuExitFullscreen;
-  return WebLocalizedString::kOverflowMenuEnterFullscreen;
+    return IDS_MEDIA_OVERFLOW_MENU_EXIT_FULLSCREEN;
+  return IDS_MEDIA_OVERFLOW_MENU_ENTER_FULLSCREEN;
 }
 
 bool MediaControlFullscreenButtonElement::HasOverflowButton() const {

third_party/blink/renderer/modules/media_controls/elements/media_control_fullscreen_button_element.h

@@ -22,7 +22,7 @@ class MediaControlFullscreenButtonElement final
 
   // MediaControlInputElement overrides.
   bool WillRespondToMouseClickEvents() override;
-  WebLocalizedString::Name GetOverflowStringName() const override;
+  int GetOverflowStringId() const override;
   bool HasOverflowButton() const override;
   bool IsControlPanelButton() const override;
 

third_party/blink/renderer/modules/media_controls/elements/media_control_input_element.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/modules/media_controls/elements/media_control_input_element.h"
 
 #include "third_party/blink/public/platform/web_size.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/css/css_property_names.h"
 #include "third_party/blink/renderer/core/css_value_keywords.h"
 #include "third_party/blink/renderer/core/dom/dom_token_list.h"
@@ -186,10 +187,9 @@ MediaControlInputElement::MediaControlInputElement(
     : HTMLInputElement(media_controls.GetDocument(), CreateElementFlags()),
       MediaControlElementBase(media_controls, this) {}
 
-WebLocalizedString::Name MediaControlInputElement::GetOverflowStringName()
-    const {
+int MediaControlInputElement::GetOverflowStringId() const {
   NOTREACHED();
-  return WebLocalizedString::kAXAMPMFieldText;
+  return IDS_AX_AM_PM_FIELD_TEXT;
 }
 
 void MediaControlInputElement::UpdateShownState() {
@@ -256,7 +256,7 @@ bool MediaControlInputElement::IsMediaControlElement() const {
 }
 
 String MediaControlInputElement::GetOverflowMenuString() const {
-  return MediaElement().GetLocale().QueryString(GetOverflowStringName());
+  return MediaElement().GetLocale().QueryString(GetOverflowStringId());
 }
 
 String MediaControlInputElement::GetOverflowMenuSubtitleString() const {

third_party/blink/renderer/modules/media_controls/elements/media_control_input_element.h

@@ -49,10 +49,10 @@ class MODULES_EXPORT MediaControlInputElement : public HTMLInputElement,
   // will be used as a suffix for histograms.
   virtual const char* GetNameForHistograms() const = 0;
 
-  // Returns a string representation of the media control element.
-  // Subclasses should override this method to return the string representation
+  // Returns a string resource id of the media control element.
+  // Subclasses should override this method to return the string resource id
   // of the overflow button.
-  virtual WebLocalizedString::Name GetOverflowStringName() const;
+  virtual int GetOverflowStringId() const;
 
   // Implements a default event handler to record interaction on click.
   void DefaultEventHandler(Event&) override;

third_party/blink/renderer/modules/media_controls/elements/media_control_input_element_test.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/modules/media_controls/elements/media_control_input_element.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
 #include "third_party/blink/renderer/core/html/media/html_media_element.h"
 #include "third_party/blink/renderer/core/html/media/html_video_element.h"
@@ -44,8 +45,8 @@ class MediaControlInputElementImpl final : public MediaControlInputElement {
                                : "MediaControlInputElementImpl";
   }
 
-  WebLocalizedString::Name GetOverflowStringName() const final {
-    return WebLocalizedString::kOverflowMenuDownload;
+  int GetOverflowStringId() const final {
+    return IDS_MEDIA_OVERFLOW_MENU_DOWNLOAD;
   }
 };
 

third_party/blink/renderer/modules/media_controls/elements/media_control_mute_button_element.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/modules/media_controls/elements/media_control_mute_button_element.h"
 
 #include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
 #include "third_party/blink/renderer/core/html/media/html_media_element.h"
 #include "third_party/blink/renderer/core/input_type_names.h"
@@ -39,11 +40,10 @@ void MediaControlMuteButtonElement::UpdateDisplayType() {
   MediaControlInputElement::UpdateDisplayType();
 }
 
-WebLocalizedString::Name MediaControlMuteButtonElement::GetOverflowStringName()
-    const {
+int MediaControlMuteButtonElement::GetOverflowStringId() const {
   if (MediaElement().muted())
-    return WebLocalizedString::kOverflowMenuUnmute;
-  return WebLocalizedString::kOverflowMenuMute;
+    return IDS_MEDIA_OVERFLOW_MENU_UNMUTE;
+  return IDS_MEDIA_OVERFLOW_MENU_MUTE;
 }
 
 bool MediaControlMuteButtonElement::HasOverflowButton() const {

third_party/blink/renderer/modules/media_controls/elements/media_control_mute_button_element.h

@@ -19,7 +19,7 @@ class MediaControlMuteButtonElement final : public MediaControlInputElement {
   // MediaControlInputElement overrides.
   bool WillRespondToMouseClickEvents() override;
   void UpdateDisplayType() override;
-  WebLocalizedString::Name GetOverflowStringName() const override;
+  int GetOverflowStringId() const override;
   bool HasOverflowButton() const override;
   bool IsControlPanelButton() const override;
 

third_party/blink/renderer/modules/media_controls/elements/media_control_picture_in_picture_button_element.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/modules/media_controls/elements/media_control_picture_in_picture_button_element.h"
 
 #include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
 #include "third_party/blink/renderer/core/html/media/html_media_element.h"
 #include "third_party/blink/renderer/core/html/media/html_media_source.h"
@@ -51,16 +52,15 @@ void MediaControlPictureInPictureButtonElement::UpdateDisplayType() {
   MediaControlInputElement::UpdateDisplayType();
 }
 
-WebLocalizedString::Name
-MediaControlPictureInPictureButtonElement::GetOverflowStringName() const {
+int MediaControlPictureInPictureButtonElement::GetOverflowStringId() const {
   DCHECK(MediaElement().IsHTMLVideoElement());
   bool isInPictureInPicture =
       PictureInPictureController::IsElementInPictureInPicture(
           &ToHTMLVideoElement(MediaElement()));
 
   return isInPictureInPicture
-             ? WebLocalizedString::kOverflowMenuExitPictureInPicture
-             : WebLocalizedString::kOverflowMenuEnterPictureInPicture;
+             ? IDS_MEDIA_OVERFLOW_MENU_EXIT_PICTURE_IN_PICTURE
+             : IDS_MEDIA_OVERFLOW_MENU_ENTER_PICTURE_IN_PICTURE;
 }
 
 bool MediaControlPictureInPictureButtonElement::HasOverflowButton() const {

third_party/blink/renderer/modules/media_controls/elements/media_control_picture_in_picture_button_element.h

@@ -20,7 +20,7 @@ class MediaControlPictureInPictureButtonElement final
   // MediaControlInputElement:
   bool WillRespondToMouseClickEvents() override;
   void UpdateDisplayType() override;
-  WebLocalizedString::Name GetOverflowStringName() const override;
+  int GetOverflowStringId() const override;
   bool HasOverflowButton() const override;
   bool IsControlPanelButton() const override;
 

third_party/blink/renderer/modules/media_controls/elements/media_control_play_button_element.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/modules/media_controls/elements/media_control_play_button_element.h"
 
 #include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
 #include "third_party/blink/renderer/core/html/media/html_media_element.h"
 #include "third_party/blink/renderer/core/input_type_names.h"
@@ -36,11 +37,10 @@ void MediaControlPlayButtonElement::UpdateDisplayType() {
   MediaControlInputElement::UpdateDisplayType();
 }
 
-WebLocalizedString::Name MediaControlPlayButtonElement::GetOverflowStringName()
-    const {
+int MediaControlPlayButtonElement::GetOverflowStringId() const {
   if (MediaElement().paused())
-    return WebLocalizedString::kOverflowMenuPlay;
-  return WebLocalizedString::kOverflowMenuPause;
+    return IDS_MEDIA_OVERFLOW_MENU_PLAY;
+  return IDS_MEDIA_OVERFLOW_MENU_PAUSE;
 }
 
 bool MediaControlPlayButtonElement::HasOverflowButton() const {

third_party/blink/renderer/modules/media_controls/elements/media_control_play_button_element.h

@@ -19,7 +19,7 @@ class MediaControlPlayButtonElement final : public MediaControlInputElement {
   // MediaControlInputElement overrides.
   bool WillRespondToMouseClickEvents() override;
   void UpdateDisplayType() override;
-  WebLocalizedString::Name GetOverflowStringName() const override;
+  int GetOverflowStringId() const override;
   bool HasOverflowButton() const override;
   bool IsControlPanelButton() const override;
 

third_party/blink/renderer/modules/media_controls/elements/media_control_toggle_closed_captions_button_element.cc

@@ -4,6 +4,7 @@
 
 #include "third_party/blink/renderer/modules/media_controls/elements/media_control_toggle_closed_captions_button_element.h"
 
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
 #include "third_party/blink/renderer/core/html/media/html_media_element.h"
 #include "third_party/blink/renderer/core/html/track/text_track.h"
@@ -70,9 +71,8 @@ void MediaControlToggleClosedCaptionsButtonElement::UpdateDisplayType() {
   MediaControlInputElement::UpdateDisplayType();
 }
 
-WebLocalizedString::Name
-MediaControlToggleClosedCaptionsButtonElement::GetOverflowStringName() const {
-  return WebLocalizedString::kOverflowMenuCaptions;
+int MediaControlToggleClosedCaptionsButtonElement::GetOverflowStringId() const {
+  return IDS_MEDIA_OVERFLOW_MENU_CLOSED_CAPTIONS;
 }
 
 bool MediaControlToggleClosedCaptionsButtonElement::HasOverflowButton() const {

third_party/blink/renderer/modules/media_controls/elements/media_control_toggle_closed_captions_button_element.h

@@ -21,7 +21,7 @@ class MODULES_EXPORT MediaControlToggleClosedCaptionsButtonElement final
   // MediaControlInputElement overrides.
   bool WillRespondToMouseClickEvents() override;
   void UpdateDisplayType() override;
-  WebLocalizedString::Name GetOverflowStringName() const override;
+  int GetOverflowStringId() const override;
   bool HasOverflowButton() const override;
   String GetOverflowMenuSubtitleString() const override;