Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1246)

Unified Diff: app/l10n_util_win.cc

Issue 3056029: Move the number conversions from string_util to a new file.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « app/l10n_util.cc ('k') | base/base.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/l10n_util_win.cc
===================================================================
--- app/l10n_util_win.cc (revision 54340)
+++ app/l10n_util_win.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -9,7 +9,8 @@
#include "app/l10n_util_win.h"
#include "base/i18n/rtl.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
+//#include "base/string_util.h"
#include "base/win_util.h"
#include "grit/app_locale_settings.h"
@@ -107,7 +108,11 @@
}
std::wstring ui_font_family = GetString(ui_font_family_id);
- int scaler100 = StringToInt(l10n_util::GetString(ui_font_size_scaler_id));
+ int scaler100;
+ if (!base::StringToInt(l10n_util::GetString(ui_font_size_scaler_id),
+ &scaler100))
+ return false;
+
// We use the OS default in two cases:
// 1) The resource bundle has 'default' and '100' for font family and
// font scaler.
« no previous file with comments | « app/l10n_util.cc ('k') | base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698