Revert of Updates Zoom bubble layout and adds +/- buttons

chrome/app/generated_resources.grd

 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 This file contains definitions of resources that will be translated for each
 locale.  The variables is_win, is_macosx, is_linux, and is_posix are available
 for making strings OS specific.  Other platform defines such as use_titlecase
 are declared in build/common.gypi.
 -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
@@ skipping 5424 matching lines @@
        </if>
       <message name="IDS_TOOLTIP_TRANSLATE" desc="The tooltip for translate">
         Translate this page
       </message>
       <message name="IDS_TOOLTIP_ZOOM" desc="The tooltip for the zoom bubble">
         Zoom: <ph name="PERCENT">$1<ex>100%</ex></ph>
       </message>
       <message name="IDS_TOOLTIP_ZOOM_EXTENSION_ICON" desc="The tooltip for the extension icon in the zoom bubble">
         This page was zoomed by the "<ph name="NAME">$1<ex>Google Cast</ex></ph>" extension
       </message>
-      <message name="IDS_ZOOM_SET_DEFAULT" desc="The text label of a button which, when clicked, returns the page to default zoom">
-        Reset
-      </message>
+      <if expr="not use_titlecase">
+        <message name="IDS_ZOOM_SET_DEFAULT" desc="The text label of a button which, when clicked, returns the page to default zoom">
+          Reset to default
+        </message>
+      </if>
+      <if expr="use_titlecase">
+        <message name="IDS_ZOOM_SET_DEFAULT" desc="In Title Case: The text label of a button which, when clicked, returns the page to default zoom">
+          Reset to Default
+        </message>
+      </if>
+      <if expr="is_macosx">
+        <message name="IDS_ZOOM_SET_DEFAULT_SHORT" desc="In Title Case: The short text label of a button which, when clicked, returns the page to default zoom">
+          Reset
+        </message>
+      </if>
 
       <!--Accessible name/action strings-->
       <message name="IDS_ACCESSIBLE_INCOGNITO_WINDOW_TITLE_FORMAT" desc="The format for the accessible title of an incognito window">
         <ph name="WINDOW_TITLE">$1</ph> (Incognito)
       </message>
       <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_FULLSCREEN" desc="The accessible name of the fullscreen button in the new merged menu">
         Full screen
@@ skipping 34 matching lines @@
       </message>
       <message name="IDS_ACCNAME_MAXIMIZE" desc="The accessible name for the Maximize button.">
         Maximize
       </message>
       <message name="IDS_ACCNAME_RESTORE" desc="The accessible name for the Restore button.">
         Restore
       </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>
-      <message name="IDS_ACCNAME_ZOOM_SET_DEFAULT" desc="The accessible description of the Reset button in the Zoom bubble.">
-        Reset to default zoom level
-      </message>
 
       <!-- Browser Hung Plugin Detector -->
       <if expr="is_win">
         <message name="IDS_BROWSER_HANGMONITOR" desc="A plugin on a page has hung">
   The following plugin is unresponsive: <ph name="PLUGIN_NAME">$1
   <ex>Shockwave
   </ex></ph>Would you like to stop it?
         </message>
       </if>
       <message name="IDS_BROWSER_HANGMONITOR_RENDERER_TITLE" desc="The title of the 'A renderer has hung' dialog. NOTE: If having no explicit # makes the phrasing awkward, feel free to add a # as necessary. [ICU Syntax]">
@@ skipping 6742 matching lines @@
       Your downloads appear here
     </message>
 
     <!-- Automation info bar -->
     <message name="IDS_CONTROLLED_BY_AUTOMATION" desc="Message shown when the browser session is being controlled by an automated test.">
       Chrome is being controlled by automated test software.
     </message>
   </messages>
  </release>
 </grit>