| 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/test/automation/tab_proxy.h" | 5 #include "chrome/test/automation/tab_proxy.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/string16.h" | 10 #include "base/string16.h" |
| (...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 bool TabProxy::WaitForTabToBeRestored(uint32 timeout_ms) { | 564 bool TabProxy::WaitForTabToBeRestored(uint32 timeout_ms) { |
| 565 if (!is_valid()) | 565 if (!is_valid()) |
| 566 return false; | 566 return false; |
| 567 bool succeeded = false; | 567 bool succeeded = false; |
| 568 return sender_->Send( | 568 return sender_->Send( |
| 569 new AutomationMsg_WaitForTabToBeRestored(handle_, &succeeded)) && | 569 new AutomationMsg_WaitForTabToBeRestored(handle_, &succeeded)) && |
| 570 succeeded; | 570 succeeded; |
| 571 } | 571 } |
| 572 | 572 |
| 573 bool TabProxy::GetSecurityState(SecurityStyle* security_style, | 573 bool TabProxy::GetSecurityState(SecurityStyle* security_style, |
| 574 int* ssl_cert_status, | 574 net::CertStatus* ssl_cert_status, |
| 575 int* insecure_content_status) { | 575 int* insecure_content_status) { |
| 576 DCHECK(security_style && ssl_cert_status && insecure_content_status); | 576 DCHECK(security_style && ssl_cert_status && insecure_content_status); |
| 577 | 577 |
| 578 if (!is_valid()) | 578 if (!is_valid()) |
| 579 return false; | 579 return false; |
| 580 | 580 |
| 581 bool succeeded = false; | 581 bool succeeded = false; |
| 582 | 582 |
| 583 sender_->Send(new AutomationMsg_GetSecurityState( | 583 sender_->Send(new AutomationMsg_GetSecurityState( |
| 584 handle_, &succeeded, security_style, ssl_cert_status, | 584 handle_, &succeeded, security_style, ssl_cert_status, |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 835 json)); | 835 json)); |
| 836 } | 836 } |
| 837 | 837 |
| 838 void TabProxy::FirstObjectAdded() { | 838 void TabProxy::FirstObjectAdded() { |
| 839 AddRef(); | 839 AddRef(); |
| 840 } | 840 } |
| 841 | 841 |
| 842 void TabProxy::LastObjectRemoved() { | 842 void TabProxy::LastObjectRemoved() { |
| 843 Release(); | 843 Release(); |
| 844 } | 844 } |
| OLD | NEW |