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/file_version_info.h" | 10 #include "base/file_version_info.h" |
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
478 | 478 |
479 void AutomationProxy::InvalidateHandle(const IPC::Message& message) { | 479 void AutomationProxy::InvalidateHandle(const IPC::Message& message) { |
480 void* iter = NULL; | 480 void* iter = NULL; |
481 int handle; | 481 int handle; |
482 | 482 |
483 if (message.ReadInt(&iter, &handle)) { | 483 if (message.ReadInt(&iter, &handle)) { |
484 tracker_->InvalidateHandle(handle); | 484 tracker_->InvalidateHandle(handle); |
485 } | 485 } |
486 } | 486 } |
487 | 487 |
488 bool AutomationProxy::OpenNewBrowserWindow(BrowserProxy::Type type, | 488 bool AutomationProxy::OpenNewBrowserWindow(Browser::Type type, bool show) { |
489 bool show) { | 489 if (type == Browser::TYPE_NORMAL) |
490 if (type == BrowserProxy::TYPE_NORMAL) | |
491 return Send(new AutomationMsg_OpenNewBrowserWindow(0, show)); | 490 return Send(new AutomationMsg_OpenNewBrowserWindow(0, show)); |
492 return Send( | 491 return Send( |
493 new AutomationMsg_OpenNewBrowserWindowOfType(0, static_cast<int>(type), | 492 new AutomationMsg_OpenNewBrowserWindowOfType(0, static_cast<int>(type), |
494 show)); | 493 show)); |
495 } | 494 } |
496 | 495 |
497 scoped_refptr<TabProxy> AutomationProxy::CreateExternalTab( | 496 scoped_refptr<TabProxy> AutomationProxy::CreateExternalTab( |
498 const IPC::ExternalTabSettings& settings, | 497 const IPC::ExternalTabSettings& settings, |
499 gfx::NativeWindow* external_tab_container, | 498 gfx::NativeWindow* external_tab_container, |
500 gfx::NativeWindow* tab) { | 499 gfx::NativeWindow* tab) { |
(...skipping 26 matching lines...) Expand all Loading... |
527 if (!p) { | 526 if (!p) { |
528 p = new T(this, tracker_.get(), handle); | 527 p = new T(this, tracker_.get(), handle); |
529 p->AddRef(); | 528 p->AddRef(); |
530 } | 529 } |
531 | 530 |
532 // Since there is no scoped_refptr::attach. | 531 // Since there is no scoped_refptr::attach. |
533 scoped_refptr<T> result; | 532 scoped_refptr<T> result; |
534 result.swap(&p); | 533 result.swap(&p); |
535 return result; | 534 return result; |
536 } | 535 } |
OLD | NEW |