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 <algorithm> | 5 #include <algorithm> |
6 #include <set> | 6 #include <set> |
7 | 7 |
8 #include "chrome/browser/tab_contents/render_view_context_menu.h" | 8 #include "chrome/browser/tab_contents/render_view_context_menu.h" |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1578 | 1578 |
1579 case IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE: | 1579 case IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE: |
1580 source_tab_contents_->ViewFrameSource(params_.frame_url, | 1580 source_tab_contents_->ViewFrameSource(params_.frame_url, |
1581 params_.frame_content_state); | 1581 params_.frame_content_state); |
1582 break; | 1582 break; |
1583 | 1583 |
1584 case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: { | 1584 case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: { |
1585 // Deserialize the SSL info. | 1585 // Deserialize the SSL info. |
1586 NavigationEntry::SSLStatus ssl; | 1586 NavigationEntry::SSLStatus ssl; |
1587 if (!params_.security_info.empty()) { | 1587 if (!params_.security_info.empty()) { |
1588 int cert_id, cert_status, security_bits, connection_status; | 1588 int cert_id; |
| 1589 net::CertStatus cert_status; |
| 1590 int security_bits; |
| 1591 int connection_status; |
1589 SSLManager::DeserializeSecurityInfo(params_.security_info, | 1592 SSLManager::DeserializeSecurityInfo(params_.security_info, |
1590 &cert_id, | 1593 &cert_id, |
1591 &cert_status, | 1594 &cert_status, |
1592 &security_bits, | 1595 &security_bits, |
1593 &connection_status); | 1596 &connection_status); |
1594 ssl.set_cert_id(cert_id); | 1597 ssl.set_cert_id(cert_id); |
1595 ssl.set_cert_status(cert_status); | 1598 ssl.set_cert_status(cert_status); |
1596 ssl.set_security_bits(security_bits); | 1599 ssl.set_security_bits(security_bits); |
1597 ssl.set_connection_status(connection_status); | 1600 ssl.set_connection_status(connection_status); |
1598 } | 1601 } |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1854 g_browser_process->clipboard()); | 1857 g_browser_process->clipboard()); |
1855 } | 1858 } |
1856 | 1859 |
1857 void RenderViewContextMenu::MediaPlayerActionAt( | 1860 void RenderViewContextMenu::MediaPlayerActionAt( |
1858 const gfx::Point& location, | 1861 const gfx::Point& location, |
1859 const WebMediaPlayerAction& action) { | 1862 const WebMediaPlayerAction& action) { |
1860 RenderViewHost* rvh = source_tab_contents_->render_view_host(); | 1863 RenderViewHost* rvh = source_tab_contents_->render_view_host(); |
1861 rvh->Send(new ViewMsg_MediaPlayerActionAt( | 1864 rvh->Send(new ViewMsg_MediaPlayerActionAt( |
1862 rvh->routing_id(), location, action)); | 1865 rvh->routing_id(), location, action)); |
1863 } | 1866 } |
OLD | NEW |