diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 19:28:44 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 19:28:44 +0000 |
| commit | 528c56de01bbbd38788ed6cf8d2eea4c56cbe19e (patch) | |
| tree | ac4f7a001affd772c4ab89701d3d46109b5f9e19 /app/l10n_util_win.cc | |
| parent | 5c86ada8d84f6e67d17b027d347052ef451241c4 (diff) | |
| download | chromium_src-528c56de01bbbd38788ed6cf8d2eea4c56cbe19e.zip chromium_src-528c56de01bbbd38788ed6cf8d2eea4c56cbe19e.tar.gz chromium_src-528c56de01bbbd38788ed6cf8d2eea4c56cbe19e.tar.bz2 | |
Move the number conversions from string_util to a new file.
Use the base namespace in the new file. Update callers.
I removed all wstring variants and also the string->number ones that ignore the return value. That encourages people to write code and forget about error handling.
TEST=included unit tests
BUG=none
Review URL: http://codereview.chromium.org/3056029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/l10n_util_win.cc')
| -rw-r--r-- | app/l10n_util_win.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/l10n_util_win.cc b/app/l10n_util_win.cc index 350c29a..4d22dd3 100644 --- a/app/l10n_util_win.cc +++ b/app/l10n_util_win.cc @@ -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 @@ bool NeedOverrideDefaultUIFont(std::wstring* override_font_family, } 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. |