| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome_frame/cfproxy_private.h" | 5 #include "chrome_frame/cfproxy_private.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 #include "base/atomic_sequence_num.h" | 8 #include "base/atomic_sequence_num.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 command_line->AppendSwitch(switches::kNoErrorDialogs); | 293 command_line->AppendSwitch(switches::kNoErrorDialogs); |
| 294 #endif | 294 #endif |
| 295 | 295 |
| 296 // In headless mode runs like reliability test runs we want full crash dumps | 296 // In headless mode runs like reliability test runs we want full crash dumps |
| 297 // from chrome. | 297 // from chrome. |
| 298 if (IsHeadlessMode()) | 298 if (IsHeadlessMode()) |
| 299 command_line->AppendSwitch(switches::kFullMemoryCrashReport); | 299 command_line->AppendSwitch(switches::kFullMemoryCrashReport); |
| 300 | 300 |
| 301 command_line->AppendSwitchPath(switches::kUserDataDir, profile_path); | 301 command_line->AppendSwitchPath(switches::kUserDataDir, profile_path); |
| 302 | 302 |
| 303 std::wstring command_line_string(command_line->command_line_string()); | 303 std::wstring command_line_string(command_line->GetCommandLineString()); |
| 304 if (!extra_args.empty()) { | 304 if (!extra_args.empty()) { |
| 305 command_line_string.append(L" "); | 305 command_line_string.append(L" "); |
| 306 command_line_string.append(extra_args); | 306 command_line_string.append(extra_args); |
| 307 } | 307 } |
| 308 return command_line_string; | 308 return command_line_string; |
| 309 } | 309 } |
| OLD | NEW |