diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 01:47:55 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 01:47:55 +0000 |
| commit | 884fbb700931254eeb7dd9ec61bbd3480c83e0ae (patch) | |
| tree | dc609108c65482a283428bbb4f2d1a0c25cc9f85 /chrome/browser | |
| parent | 04f70572887672c0457d8d4f58eb19a5297d1e8d (diff) | |
| download | chromium_src-884fbb700931254eeb7dd9ec61bbd3480c83e0ae.zip chromium_src-884fbb700931254eeb7dd9ec61bbd3480c83e0ae.tar.gz chromium_src-884fbb700931254eeb7dd9ec61bbd3480c83e0ae.tar.bz2 | |
De-wstringify some browser startup code and net utility.
Review URL: http://codereview.chromium.org/3054042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_init.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/browser_main.cc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 2e499b6..237ff95 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -1031,8 +1031,8 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line, } if (command_line.HasSwitch(switches::kExplicitlyAllowedPorts)) { - std::wstring allowed_ports = - command_line.GetSwitchValue(switches::kExplicitlyAllowedPorts); + std::string allowed_ports = + command_line.GetSwitchValueASCII(switches::kExplicitlyAllowedPorts); net::SetExplicitlyAllowedPorts(allowed_ports); } diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 51ebf44..1c445461 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1235,8 +1235,9 @@ int BrowserMain(const MainFunctionParams& parameters) { #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD) if (parsed_command_line.HasSwitch(switches::kDebugPrint)) { - printing::PrintedDocument::set_debug_dump_path( - parsed_command_line.GetSwitchValue(switches::kDebugPrint)); + FilePath path = + parsed_command_line.GetSwitchValuePath(switches::kDebugPrint); + printing::PrintedDocument::set_debug_dump_path(path.value()); } #endif |