diff options
author | Sylvain Defresne <sdefresne@chromium.org> | 2016-01-15 09:41:14 +0100 |
---|---|---|
committer | Sylvain Defresne <sdefresne@chromium.org> | 2016-01-15 08:43:33 +0000 |
commit | d21e62a3c7ff57d27185a621ed1c50441fa0c4c3 (patch) | |
tree | 05a4661384810c429934b6d45329bf29838545d2 | |
parent | 527b6a790ec3c821ec33ebd7019d347b8561a9d5 (diff) | |
download | chromium_src-d21e62a3c7ff57d27185a621ed1c50441fa0c4c3.zip chromium_src-d21e62a3c7ff57d27185a621ed1c50441fa0c4c3.tar.gz chromium_src-d21e62a3c7ff57d27185a621ed1c50441fa0c4c3.tar.bz2 |
Revert of Componentize IDS_ACCNAME_* strings shared with iOS. (Patchset #1 id:1 of https://codereview.chromium.org/1583803003/ )
Reason for revert:
Caused compilation failures on mac due to new usage of IDS_ACCNAME_CLOSE
string in chrome/browser/ui/cocoa/infobars/infobar_controller.mm and
chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm.
Original issue's description:
> Componentize IDS_ACCNAME_* strings shared with iOS.
>
> In order to share strings with iOS, componentize them. Two of them are
> iOS specific, so instead move them to ios_strings.grd.
>
> BUG=568486
> TBR=sky@chromium.org
>
> Committed: https://crrev.com/fdc5a2028505ca2b615f9045bff9c96d80e11906
> Cr-Commit-Position: refs/heads/master@{#369698}
TBR=sky@chromium.org,droger@chromium.org
BUG=568486
Review URL: https://codereview.chromium.org/1590583004 .
Cr-Commit-Position: refs/heads/master@{#369700}
-rw-r--r-- | chrome/app/generated_resources.grd | 20 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc | 1 | ||||
-rw-r--r-- | chrome/browser/ui/cocoa/hover_close_button.mm | 1 | ||||
-rw-r--r-- | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm | 1 | ||||
-rw-r--r-- | chrome/browser/ui/views/download/download_shelf_view.cc | 1 | ||||
-rw-r--r-- | chrome/browser/ui/views/find_bar_view.cc | 1 | ||||
-rw-r--r-- | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc | 1 | ||||
-rw-r--r-- | chrome/browser/ui/views/infobars/infobar_view.cc | 1 | ||||
-rw-r--r-- | chrome/browser/ui/views/omnibox/omnibox_view_views.cc | 1 | ||||
-rw-r--r-- | chrome/browser/ui/views/tabs/tab.cc | 1 | ||||
-rw-r--r-- | chrome/browser/ui/views/toolbar/toolbar_view.cc | 1 | ||||
-rw-r--r-- | components/components_strings.grd | 21 | ||||
-rw-r--r-- | ios/chrome/app/strings/ios_strings.grd | 8 |
13 files changed, 23 insertions, 36 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index bebce6e..ed94179 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -7136,6 +7136,12 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_ACCNAME_APP_UPGRADE_RECOMMENDED" desc="The accessible name for the app menu when software update is available."> <ph name="ACCNAME_APP">$1<ex>Chrome</ex></ph> (Update is available) </message> + <message name="IDS_ACCNAME_BACK" desc="The accessible name for the back button."> + Back + </message> + <message name="IDS_ACCNAME_FORWARD" desc="The accessible name for the forward button."> + Forward + </message> <message name="IDS_ACCNAME_FULLSCREEN" desc="The accessible name of the fullscreen button in the new merged menu"> Full screen </message> @@ -7145,6 +7151,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_ACCNAME_RELOAD" desc="The accessible name for the reload/stop button."> Reload </message> + <message name="IDS_ACCNAME_LOCATION" desc="The accessible name for the editable-text portion of the omnibox."> + Address and search bar + </message> <message name="IDS_ACCNAME_ZOOM" desc="The accessible name for the zoom button."> Zoom </message> @@ -7187,9 +7196,20 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_ACCNAME_RESTORE" desc="The accessible name for the Restore button."> Restore </message> + <message name="IDS_ACCNAME_CLOSE" desc="The accessible name for the Close button."> + Close + </message> <message name="IDS_ACCNAME_CLOSE_TAB" desc="The accessible name for the button that is used to close a specific tab."> Close <ph name="TAB_NAME">$1<ex>Google Search</ex></ph> </message> + <if expr="is_ios"> + <message name="IDS_ACCNAME_CLEAR_TEXT" desc="The accessibility label for the clear text button in the location bar [Length: unlimited]."> + Clear Text + </message> + <message name="IDS_ACCNAME_VOICE_SEARCH" desc="The accessibility label for the voice search button in the location bar [Length: unlimited]"> + Voice Search + </message> + </if> <!-- Browser Hung Plugin Detector --> <if expr="is_win"> diff --git a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc index ab627c3..8276902 100644 --- a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc +++ b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc @@ -29,7 +29,6 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" -#include "grit/components_strings.h" #include "ipc/ipc_message.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/theme_provider.h" diff --git a/chrome/browser/ui/cocoa/hover_close_button.mm b/chrome/browser/ui/cocoa/hover_close_button.mm index bef45de..be82dc5 100644 --- a/chrome/browser/ui/cocoa/hover_close_button.mm +++ b/chrome/browser/ui/cocoa/hover_close_button.mm @@ -6,7 +6,6 @@ #include "base/strings/sys_string_conversions.h" #include "chrome/grit/generated_resources.h" -#include "grit/components_strings.h" #include "grit/theme_resources.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMKeyValueAnimation.h" #include "ui/base/cocoa/animation_utils.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index dcd38d5..09ed148 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -58,7 +58,6 @@ #include "components/search_engines/template_url_service.h" #include "components/url_formatter/url_fixer.h" #include "content/public/browser/web_contents.h" -#include "grit/components_strings.h" #include "grit/theme_resources.h" #import "ui/base/cocoa/menu_controller.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc index 96d5474..94c139f 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_view.cc @@ -23,7 +23,6 @@ #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/page_navigator.h" -#include "grit/components_strings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/material_design/material_design_controller.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index e0dac29..6e5e672 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -22,7 +22,6 @@ #include "chrome/browser/ui/views/find_bar_host.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/grit/generated_resources.h" -#include "grit/components_strings.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkPaint.h" #include "ui/base/ime/input_method.h" diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 8f9af56..61599da 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -28,7 +28,6 @@ #include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" -#include "grit/components_strings.h" #include "grit/theme_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/hit_test.h" diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index 57c8bc4..b3cd2e2 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -14,7 +14,6 @@ #include "chrome/browser/ui/views/infobars/infobar_background.h" #include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar_delegate.h" -#include "grit/components_strings.h" #include "grit/theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/accessibility/ax_view_state.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index fa57708..bc7b351 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -34,7 +34,6 @@ #include "components/toolbar/toolbar_model.h" #include "content/public/browser/web_contents.h" #include "extensions/common/constants.h" -#include "grit/components_strings.h" #include "net/base/escape.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/accessibility/ax_view_state.h" diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index 5c95976..752df26 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -28,7 +28,6 @@ #include "chrome/grit/generated_resources.h" #include "content/public/browser/user_metrics.h" #include "grit/components_scaled_resources.h" -#include "grit/components_strings.h" #include "grit/theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "third_party/skia/include/pathops/SkPathOps.h" diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc index 822175d..4e252b6 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -54,7 +54,6 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" -#include "grit/components_strings.h" #include "grit/theme_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/components_strings.grd b/components/components_strings.grd index 0a1e1fa..250efc8 100644 --- a/components/components_strings.grd +++ b/components/components_strings.grd @@ -222,6 +222,9 @@ <message name="IDS_OK" desc="Used for OK on buttons"> OK </message> + <message name="IDS_UTILITY_PROCESS_JSON_PARSER_NAME" desc="The name of the utility process used for parsing JSON files."> + JSON Parser + </message> <if expr="not is_android"> <if expr="not use_titlecase"> <message name="IDS_PRINT" desc="The text label of the Print... menu item. Opens a dialog box to select print settings"> @@ -234,24 +237,6 @@ </message> </if> </if> - - <!-- Accessibility labels for generic items --> - <message name="IDS_ACCNAME_BACK" desc="The accessible name for the back button."> - Back - </message> - <message name="IDS_ACCNAME_FORWARD" desc="The accessible name for the forward button."> - Forward - </message> - <message name="IDS_ACCNAME_CLOSE" desc="The accessible name for the Close button."> - Close - </message> - <message name="IDS_ACCNAME_LOCATION" desc="The accessible name for the editable-text portion of the omnibox."> - Address and search bar - </message> - - <message name="IDS_UTILITY_PROCESS_JSON_PARSER_NAME" desc="The name of the utility process used for parsing JSON files."> - JSON Parser - </message> </messages> </release> </grit> diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios_strings.grd index 0f33926..b7d6c0d 100644 --- a/ios/chrome/app/strings/ios_strings.grd +++ b/ios/chrome/app/strings/ios_strings.grd @@ -299,14 +299,6 @@ brand. [Length: 70em]"> <message name="IDS_IOS_UPGRADE_AVAILABLE_BUTTON" desc="Displayed on a button the user can use to upgrade the a more recent version of the application. [Length: 10em]"> Update </message> - - <!-- Accessibility labels --> - <message name="IDS_IOS_ACCNAME_CLEAR_TEXT" desc="The accessibility label for the clear text button in the location bar [Length: unlimited]."> - Clear Text - </message> - <message name="IDS_IOS_ACCNAME_VOICE_SEARCH" desc="The accessibility label for the voice search button in the location bar [Length: unlimited]"> - Voice Search - </message> </messages> </release> </grit> |