diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 04:54:52 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 04:54:52 +0000 |
commit | 61a4c6f8372350bedd95d8834c8bfd1b36a27c1b (patch) | |
tree | d2c796ee2336083b018d6a38fc54627b26559498 /chrome_frame | |
parent | 480ac51965719719beb1761274491acb6eda95e9 (diff) | |
download | chromium_src-61a4c6f8372350bedd95d8834c8bfd1b36a27c1b.zip chromium_src-61a4c6f8372350bedd95d8834c8bfd1b36a27c1b.tar.gz chromium_src-61a4c6f8372350bedd95d8834c8bfd1b36a27c1b.tar.bz2 |
Rename CommandLine::GetCommandLineString().
Fix string hackery in net/tools/dump_cache/dump_cache.cc
Fix const casts in chrome/installer/util/product.cc and base/process_util_win.cc.
BUG=73195
TEST=none
Review URL: http://codereview.chromium.org/7386002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/cfproxy_support.cc | 2 | ||||
-rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 2 | ||||
-rw-r--r-- | chrome_frame/chrome_launcher_unittest.cc | 10 | ||||
-rw-r--r-- | chrome_frame/chrome_tab.cc | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/chrome_frame/cfproxy_support.cc b/chrome_frame/cfproxy_support.cc index 7fd61b7..4e7d8070 100644 --- a/chrome_frame/cfproxy_support.cc +++ b/chrome_frame/cfproxy_support.cc @@ -300,7 +300,7 @@ std::wstring BuildCmdLine(const std::string& channel_id, command_line->AppendSwitchPath(switches::kUserDataDir, profile_path); - std::wstring command_line_string(command_line->command_line_string()); + std::wstring command_line_string(command_line->GetCommandLineString()); if (!extra_args.empty()) { command_line_string.append(L" "); command_line_string.append(extra_args); diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 5ba5363..252f8fb 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -291,7 +291,7 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params, if (!params->language().empty()) command_line->AppendSwitchNative(switches::kLang, params->language()); - std::wstring command_line_string(command_line->command_line_string()); + std::wstring command_line_string(command_line->GetCommandLineString()); // If there are any extra arguments, append them to the command line. if (!params->extra_arguments().empty()) { command_line_string += L' ' + params->extra_arguments(); diff --git a/chrome_frame/chrome_launcher_unittest.cc b/chrome_frame/chrome_launcher_unittest.cc index caa02c0..0f2db43 100644 --- a/chrome_frame/chrome_launcher_unittest.cc +++ b/chrome_frame/chrome_launcher_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -15,22 +15,22 @@ TEST(ChromeLauncher, IsValidCommandLine) { bad.AppendSwitch(switches::kHomePage); // exists but not in whitelist EXPECT_FALSE(chrome_launcher::IsValidCommandLine( - bad.command_line_string().c_str())); + bad.GetCommandLineString().c_str())); CommandLine good(FilePath(L"dummy.exe")); good.AppendSwitch(switches::kNoFirstRun); // in whitelist good.AppendSwitchASCII(switches::kUserDataDir, "foo"); // in whitelist EXPECT_TRUE(chrome_launcher::IsValidCommandLine( - good.command_line_string().c_str())); + good.GetCommandLineString().c_str())); CommandLine no_params(FilePath(L"dummy.exe")); EXPECT_TRUE(chrome_launcher::IsValidCommandLine( - no_params.command_line_string().c_str())); + no_params.GetCommandLineString().c_str())); CommandLine empty(FilePath(L"")); EXPECT_TRUE(chrome_launcher::IsValidCommandLine( - empty.command_line_string().c_str())); + empty.GetCommandLineString().c_str())); } TEST(ChromeLauncher, TrimWhiteSpace) { diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index 45c610b..b77d94e 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -330,7 +330,7 @@ HRESULT SetupRunOnce() { "0"); run_once_cmd.AppendSwitch(switches::kChromeFrame); ret = run_once.WriteValue(L"A", - run_once_cmd.command_line_string().c_str()); + run_once_cmd.GetCommandLineString().c_str()); } result = HRESULT_FROM_WIN32(ret); } else { |