diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 15:07:03 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 15:07:03 +0000 |
| commit | 55eff3466e18449d552dcab6ce296ccfd66705e6 (patch) | |
| tree | 137a0ab8a0867f207abc7cb1a6325554ff9cd5dd /chrome/browser/first_run | |
| parent | c9c07779224d9dd320323943a569dbf2e416a411 (diff) | |
| download | chromium_src-55eff3466e18449d552dcab6ce296ccfd66705e6.zip chromium_src-55eff3466e18449d552dcab6ce296ccfd66705e6.tar.gz chromium_src-55eff3466e18449d552dcab6ce296ccfd66705e6.tar.bz2 | |
Fix the Windows build.
TEST=it compiles
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/first_run_win.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 9e2c87c..b0e0e6c 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -592,13 +592,15 @@ bool DecodeImportParams(const std::wstring& encoded, if (v.size() != 3) return false; - if (!base::StringToInt(v[0], browser_type)) + if (!base::StringToInt(WideToUTF16Hack(v[0]), browser_type)) return false; - if (!base::StringToInt(v[1], options)) + if (!base::StringToInt(WideToUTF16Hack(v[1]), options)) return false; - *window = reinterpret_cast<HWND>(base::StringToInt64(v[2])); + int64 window_int; + base::StringToInt64(WideToUTF16Hack(v[2]), &window_int); + *window = reinterpret_cast<HWND>(window_int); return true; } |