| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/process_util.h" | 10 #include "base/process_util.h" |
| 11 #include "base/scoped_ptr.h" |
| 11 #include "chrome/common/automation_messages.h" | 12 #include "chrome/common/automation_messages.h" |
| 12 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 13 #include "chrome_frame/chrome_launcher_utils.h" | 14 #include "chrome_frame/chrome_launcher_utils.h" |
| 14 #include "chrome_frame/utils.h" // for IsHeadlessMode(); | 15 #include "chrome_frame/utils.h" // for IsHeadlessMode(); |
| 15 | 16 |
| 16 | 17 |
| 17 namespace { | 18 namespace { |
| 18 void DispatchReplyFail(uint32 type, | 19 void DispatchReplyFail(uint32 type, |
| 19 ChromeProxyDelegate* delegate, | 20 ChromeProxyDelegate* delegate, |
| 20 SyncMessageContext* ctx) { | 21 SyncMessageContext* ctx) { |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 | 336 |
| 336 command_line->AppendSwitchPath(switches::kUserDataDir, profile_path); | 337 command_line->AppendSwitchPath(switches::kUserDataDir, profile_path); |
| 337 | 338 |
| 338 std::wstring command_line_string(command_line->command_line_string()); | 339 std::wstring command_line_string(command_line->command_line_string()); |
| 339 if (!extra_args.empty()) { | 340 if (!extra_args.empty()) { |
| 340 command_line_string.append(L" "); | 341 command_line_string.append(L" "); |
| 341 command_line_string.append(extra_args); | 342 command_line_string.append(extra_args); |
| 342 } | 343 } |
| 343 return command_line_string; | 344 return command_line_string; |
| 344 } | 345 } |
| OLD | NEW |