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 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 bool TabProxy::WaitForTabToBeRestored(uint32 timeout_ms) { | 579 bool TabProxy::WaitForTabToBeRestored(uint32 timeout_ms) { |
580 if (!is_valid()) | 580 if (!is_valid()) |
581 return false; | 581 return false; |
582 bool succeeded = false; | 582 bool succeeded = false; |
583 return sender_->Send( | 583 return sender_->Send( |
584 new AutomationMsg_WaitForTabToBeRestored(handle_, &succeeded)) && | 584 new AutomationMsg_WaitForTabToBeRestored(handle_, &succeeded)) && |
585 succeeded; | 585 succeeded; |
586 } | 586 } |
587 | 587 |
588 bool TabProxy::GetSecurityState(SecurityStyle* security_style, | 588 bool TabProxy::GetSecurityState(SecurityStyle* security_style, |
589 int* ssl_cert_status, | 589 net::CertStatus* ssl_cert_status, |
590 int* insecure_content_status) { | 590 int* insecure_content_status) { |
591 DCHECK(security_style && ssl_cert_status && insecure_content_status); | 591 DCHECK(security_style && ssl_cert_status && insecure_content_status); |
592 | 592 |
593 if (!is_valid()) | 593 if (!is_valid()) |
594 return false; | 594 return false; |
595 | 595 |
596 bool succeeded = false; | 596 bool succeeded = false; |
597 | 597 |
598 sender_->Send(new AutomationMsg_GetSecurityState( | 598 sender_->Send(new AutomationMsg_GetSecurityState( |
599 handle_, &succeeded, security_style, ssl_cert_status, | 599 handle_, &succeeded, security_style, ssl_cert_status, |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
850 json)); | 850 json)); |
851 } | 851 } |
852 | 852 |
853 void TabProxy::FirstObjectAdded() { | 853 void TabProxy::FirstObjectAdded() { |
854 AddRef(); | 854 AddRef(); |
855 } | 855 } |
856 | 856 |
857 void TabProxy::LastObjectRemoved() { | 857 void TabProxy::LastObjectRemoved() { |
858 Release(); | 858 Release(); |
859 } | 859 } |
OLD | NEW |