OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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" |
11 #include "base/process_util.h" | 11 #include "base/process_util.h" |
(...skipping 13 matching lines...) Expand all Loading... |
25 break; | 25 break; |
26 case AutomationMsg_ConnectExternalTab::ID: | 26 case AutomationMsg_ConnectExternalTab::ID: |
27 delegate->Completed_ConnectToTab(false, NULL, NULL, 0, 0); | 27 delegate->Completed_ConnectToTab(false, NULL, NULL, 0, 0); |
28 break; | 28 break; |
29 } | 29 } |
30 } | 30 } |
31 | 31 |
32 bool DispatchReplyOk(const IPC::Message* reply_msg, uint32 type, | 32 bool DispatchReplyOk(const IPC::Message* reply_msg, uint32 type, |
33 ChromeProxyDelegate* delegate, SyncMessageContext* ctx, | 33 ChromeProxyDelegate* delegate, SyncMessageContext* ctx, |
34 TabsMap* tab2delegate) { | 34 TabsMap* tab2delegate) { |
35 void* iter = IPC::SyncMessage::GetDataIterator(reply_msg); | 35 PickleIterator iter = IPC::SyncMessage::GetDataIterator(reply_msg); |
36 switch (type) { | 36 switch (type) { |
37 case AutomationMsg_CreateExternalTab::ID: { | 37 case AutomationMsg_CreateExternalTab::ID: { |
38 // Tuple4<HWND, HWND, int, int> out; | 38 // Tuple4<HWND, HWND, int, int> out; |
39 TupleTypes<AutomationMsg_CreateExternalTab::ReplyParam>::ValueTuple out; | 39 TupleTypes<AutomationMsg_CreateExternalTab::ReplyParam>::ValueTuple out; |
40 if (ReadParam(reply_msg, &iter, &out)) { | 40 if (ReadParam(reply_msg, &iter, &out)) { |
41 DCHECK(tab2delegate->find(out.c) == tab2delegate->end()); | 41 DCHECK(tab2delegate->find(out.c) == tab2delegate->end()); |
42 (*tab2delegate)[out.c] = delegate; | 42 (*tab2delegate)[out.c] = delegate; |
43 delegate->Completed_CreateTab(true, out.a, out.b, out.c, out.d); | 43 delegate->Completed_CreateTab(true, out.a, out.b, out.c, out.d); |
44 } | 44 } |
45 return true; | 45 return true; |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
303 | 303 |
304 command_line_string = command_line->GetCommandLineString(); | 304 command_line_string = command_line->GetCommandLineString(); |
305 if (!extra_args.empty()) { | 305 if (!extra_args.empty()) { |
306 command_line_string.append(L" "); | 306 command_line_string.append(L" "); |
307 command_line_string.append(extra_args); | 307 command_line_string.append(extra_args); |
308 } | 308 } |
309 } | 309 } |
310 | 310 |
311 return command_line_string; | 311 return command_line_string; |
312 } | 312 } |
OLD | NEW |