diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 14:39:42 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 14:39:42 +0000 |
| commit | c9c07779224d9dd320323943a569dbf2e416a411 (patch) | |
| tree | a040e1ca03410c7cb37547b16b5a0fb8bea67dde /chrome/installer/setup/setup_main.cc | |
| parent | be1ce6a7b2fa7e9622e5b249abd5fab478b6ca05 (diff) | |
| download | chromium_src-c9c07779224d9dd320323943a569dbf2e416a411.zip chromium_src-c9c07779224d9dd320323943a569dbf2e416a411.tar.gz chromium_src-c9c07779224d9dd320323943a569dbf2e416a411.tar.bz2 | |
Remove number conversion functions from string_util. These moved to string_number_conversions.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3054036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/setup_main.cc')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 3cbd522..08e9ae5 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.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. @@ -16,6 +16,7 @@ #include "base/process_util.h" #include "base/registry.h" #include "base/scoped_handle_win.h" +#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win_util.h" @@ -521,7 +522,9 @@ bool HandleNonInstallCmdLineOptions(const CommandLine& cmd_line, // Launch the inactive user toast experiment. std::wstring flavor = cmd_line.GetSwitchValue(installer_util::switches::kInactiveUserToast); - dist->InactiveUserToastExperiment(StringToInt(flavor), + int flavor_int; + base::StringToInt(flavor, &flavor_int); + dist->InactiveUserToastExperiment(flavor_int, cmd_line.HasSwitch(installer_util::switches::kSystemLevelToast)); return true; } else if (cmd_line.HasSwitch(installer_util::switches::kSystemLevelToast)) { |