diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 15:21:27 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 15:21:27 +0000 |
| commit | b1a71cc2cce3c8bcd94ebbe22deee5117a725125 (patch) | |
| tree | 2a5a19a6713324f3cf746c9c9d9ab1d545422abe | |
| parent | 55eff3466e18449d552dcab6ce296ccfd66705e6 (diff) | |
| download | chromium_src-b1a71cc2cce3c8bcd94ebbe22deee5117a725125.zip chromium_src-b1a71cc2cce3c8bcd94ebbe22deee5117a725125.tar.gz chromium_src-b1a71cc2cce3c8bcd94ebbe22deee5117a725125.tar.bz2 | |
Fix the Windows build again.
TEST=none
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54749 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_main.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/first_run/first_run_win.cc | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index ef3d4c8..51491c9 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -640,7 +640,10 @@ void AdjustUIFont(LOGFONT* logfont) { } int GetMinimumFontSize() { - return StringToInt(l10n_util::GetString(IDS_MINIMUM_UI_FONT_SIZE).c_str()); + int min_font_size; + base::StringToInt(l10n_util::GetStringUTF16(IDS_MINIMUM_UI_FONT_SIZE), + &min_font_size); + return min_font_size; } #endif @@ -871,8 +874,9 @@ int BrowserMain(const MainFunctionParams& parameters) { parsed_command_line.GetSwitchValueASCII(switches::kTryChromeAgain); if (!try_chrome.empty()) { #if defined(OS_WIN) - Upgrade::TryResult answer = - Upgrade::ShowTryChromeDialog(StringToInt(try_chrome)); + int try_chrome_int; + base::StringToInt(try_chrome, &try_chrome_int); + Upgrade::TryResult answer = Upgrade::ShowTryChromeDialog(try_chrome_int); if (answer == Upgrade::TD_NOT_NOW) return ResultCodes::NORMAL_EXIT_CANCEL; if (answer == Upgrade::TD_UNINSTALL_CHROME) diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index b0e0e6c..afac507 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -26,6 +26,7 @@ #include "base/scoped_comptr_win.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/win_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" |