OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 <sstream> | 5 #include <sstream> |
6 | 6 |
7 #include "chrome/test/automation/automation_proxy.h" | 7 #include "chrome/test/automation/automation_proxy.h" |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 } | 388 } |
389 | 389 |
390 return new BrowserProxy(this, tracker_.get(), handle); | 390 return new BrowserProxy(this, tracker_.get(), handle); |
391 } | 391 } |
392 | 392 |
393 BrowserProxy* AutomationProxy::GetLastActiveBrowserWindow() { | 393 BrowserProxy* AutomationProxy::GetLastActiveBrowserWindow() { |
394 int handle = 0; | 394 int handle = 0; |
395 | 395 |
396 if (!SendWithTimeout(new AutomationMsg_LastActiveBrowserWindow( | 396 if (!SendWithTimeout(new AutomationMsg_LastActiveBrowserWindow( |
397 0, &handle), command_execution_timeout_ms(), NULL)) { | 397 0, &handle), command_execution_timeout_ms(), NULL)) { |
398 DLOG(ERROR) << "GetLastActiveBrowserWindow did not complete in a timely fash
ion"; | 398 DLOG(ERROR) << |
| 399 "GetLastActiveBrowserWindow did not complete in a timely fashion"; |
399 return NULL; | 400 return NULL; |
400 } | 401 } |
401 | 402 |
402 return new BrowserProxy(this, tracker_.get(), handle); | 403 return new BrowserProxy(this, tracker_.get(), handle); |
403 } | 404 } |
404 | 405 |
405 #if defined(OS_POSIX) | 406 #if defined(OS_POSIX) |
406 base::file_handle_mapping_vector AutomationProxy::fds_to_map() const { | 407 base::file_handle_mapping_vector AutomationProxy::fds_to_map() const { |
407 base::file_handle_mapping_vector map; | 408 base::file_handle_mapping_vector map; |
408 int src_fd = -1, dest_fd = -1; | 409 int src_fd = -1, dest_fd = -1; |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
462 &handle)); | 463 &handle)); |
463 if (!succeeded) { | 464 if (!succeeded) { |
464 return NULL; | 465 return NULL; |
465 } | 466 } |
466 | 467 |
467 DCHECK(IsWindow(*external_tab_container)); | 468 DCHECK(IsWindow(*external_tab_container)); |
468 | 469 |
469 return new TabProxy(this, tracker_.get(), handle); | 470 return new TabProxy(this, tracker_.get(), handle); |
470 } | 471 } |
471 #endif // defined(OS_WIN) | 472 #endif // defined(OS_WIN) |
OLD | NEW |