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 /chrome/app | |
| 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 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 7018b16..a3c1cbb 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -46,6 +46,7 @@ #include "base/scoped_nsautorelease_pool.h" #include "base/stats_counters.h" #include "base/stats_table.h" +#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/diagnostics/diagnostics_main.h" @@ -583,8 +584,9 @@ int ChromeMain(int argc, char** argv) { std::wstring channel_name = parsed_command_line.GetSwitchValue(switches::kProcessChannelID); - browser_pid = - static_cast<base::ProcessId>(StringToInt(WideToASCII(channel_name))); + int browser_pid_int; + base::StringToInt(WideToUTF8(channel_name), &browser_pid_int); + browser_pid = static_cast<base::ProcessId>(browser_pid_int); DCHECK_NE(browser_pid, 0u); #elif defined(OS_MACOSX) browser_pid = base::GetCurrentProcId(); |