i18n of Zoom % to use locally correct numeric glyphs

chrome/browser/ui/views/toolbar/app_menu.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar/app_menu.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
+#include "base/i18n/number_formatting.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_stats.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 493 matching lines @@
         ui_zoom::ZoomEventManager::GetForBrowserContext(
             menu->browser_->profile())
             ->AddZoomLevelChangedCallback(
                 base::Bind(&AppMenu::ZoomView::OnZoomLevelChanged,
                            base::Unretained(this)));
 
     decrement_button_ = CreateButtonWithAccName(
         IDS_ZOOM_MINUS2, InMenuButtonBackground::LEFT_BUTTON,
         decrement_index, IDS_ACCNAME_ZOOM_MINUS2);
 
-    zoom_label_ = new Label(
-        l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, 100));

[jungshik at Google, 2016/05/17 23:58:43]

Please, drop IDS_ZOOM_PERCENT from a grd file. 

[Greg Levin, 2016/05/18 21:33:44]

Done.

+    zoom_label_ = new Label(base::FormatPercent(100));
     zoom_label_->SetAutoColorReadabilityEnabled(false);
     zoom_label_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
 
     InMenuButtonBackground* center_bg =
         new InMenuButtonBackground(InMenuButtonBackground::RIGHT_BUTTON);
     zoom_label_->set_background(center_bg);
 
     AddChildView(zoom_label_);
     zoom_label_max_width_valid_ = false;
 
@@ skipping 123 matching lines @@
     if (selected_tab) {
       auto zoom_controller =
           ui_zoom::ZoomController::FromWebContents(selected_tab);
       if (zoom_controller)
         zoom = zoom_controller->GetZoomPercent();
       increment_button_->SetEnabled(zoom <
                                     selected_tab->GetMaximumZoomPercent());
       decrement_button_->SetEnabled(zoom >
                                     selected_tab->GetMinimumZoomPercent());
     }
-    zoom_label_->SetText(
-        l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, zoom));
-
+    zoom_label_->SetText(base::FormatPercent(zoom));
     zoom_label_max_width_valid_ = false;
   }
 
   // Returns the max width the zoom string can be.
   int ZoomLabelMaxWidth() const {
     if (!zoom_label_max_width_valid_) {
       const gfx::FontList& font_list = zoom_label_->font_list();
       int border_width = zoom_label_->border()
                              ? zoom_label_->border()->GetInsets().width()
                              : 0;
 
       int max_w = 0;
 
       WebContents* selected_tab = GetActiveWebContents();
       if (selected_tab) {
         auto zoom_controller =
             ui_zoom::ZoomController::FromWebContents(selected_tab);
         DCHECK(zoom_controller);
         // Enumerate all zoom factors that can be used in PageZoom::Zoom.
         std::vector<double> zoom_factors = ui_zoom::PageZoom::PresetZoomFactors(
             zoom_controller->GetZoomPercent());
         for (auto zoom : zoom_factors) {
           int w = gfx::GetStringWidth(
-              l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT,
-                                            static_cast<int>(zoom * 100 + 0.5)),
+              base::FormatPercent(static_cast<int>(zoom * 100 + 0.5)),

[Peter Kasting, 2016/05/18 02:37:25]

Use std::round().

[Greg Levin, 2016/05/18 21:33:44]

Done.

               font_list);
           max_w = std::max(w, max_w);
         }
       } else {
-        max_w = gfx::GetStringWidth(
-            l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, 100), font_list);
+        max_w = gfx::GetStringWidth(base::FormatPercent(100), font_list);
       }
       zoom_label_max_width_ = max_w + border_width;
 
       zoom_label_max_width_valid_ = true;
     }
     return zoom_label_max_width_;
   }
 
   // Index of the fullscreen menu item in the model.
   const int fullscreen_index_;
@@ skipping 571 matching lines @@
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_APP_MENU);
 }
 
 int AppMenu::ModelIndexFromCommandId(int command_id) const {
   CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
   DCHECK(ix != command_id_to_entry_.end());
   return ix->second.second;
 }