Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Side by Side Diff: chrome/browser/tab_contents/render_view_context_menu.cc

Issue 7995014: Revert 102322 - For the SSL cert status, convert anonymous enum that gives bit values into a type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ssl/ssl_error_info.cc ('k') | chrome/browser/ui/toolbar/toolbar_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
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 1647 matching lines...) Expand 10 before | Expand all | Expand 10 after
1658 1658
1659 case IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE: 1659 case IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE:
1660 source_tab_contents_->ViewFrameSource(params_.frame_url, 1660 source_tab_contents_->ViewFrameSource(params_.frame_url,
1661 params_.frame_content_state); 1661 params_.frame_content_state);
1662 break; 1662 break;
1663 1663
1664 case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: { 1664 case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: {
1665 // Deserialize the SSL info. 1665 // Deserialize the SSL info.
1666 NavigationEntry::SSLStatus ssl; 1666 NavigationEntry::SSLStatus ssl;
1667 if (!params_.security_info.empty()) { 1667 if (!params_.security_info.empty()) {
1668 int cert_id; 1668 int cert_id, cert_status, security_bits, connection_status;
1669 net::CertStatus cert_status;
1670 int security_bits;
1671 int connection_status;
1672 SSLManager::DeserializeSecurityInfo(params_.security_info, 1669 SSLManager::DeserializeSecurityInfo(params_.security_info,
1673 &cert_id, 1670 &cert_id,
1674 &cert_status, 1671 &cert_status,
1675 &security_bits, 1672 &security_bits,
1676 &connection_status); 1673 &connection_status);
1677 ssl.set_cert_id(cert_id); 1674 ssl.set_cert_id(cert_id);
1678 ssl.set_cert_status(cert_status); 1675 ssl.set_cert_status(cert_status);
1679 ssl.set_security_bits(security_bits); 1676 ssl.set_security_bits(security_bits);
1680 ssl.set_connection_status(connection_status); 1677 ssl.set_connection_status(connection_status);
1681 } 1678 }
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
1943 g_browser_process->clipboard()); 1940 g_browser_process->clipboard());
1944 } 1941 }
1945 1942
1946 void RenderViewContextMenu::MediaPlayerActionAt( 1943 void RenderViewContextMenu::MediaPlayerActionAt(
1947 const gfx::Point& location, 1944 const gfx::Point& location,
1948 const WebMediaPlayerAction& action) { 1945 const WebMediaPlayerAction& action) {
1949 RenderViewHost* rvh = source_tab_contents_->render_view_host(); 1946 RenderViewHost* rvh = source_tab_contents_->render_view_host();
1950 rvh->Send(new ViewMsg_MediaPlayerActionAt( 1947 rvh->Send(new ViewMsg_MediaPlayerActionAt(
1951 rvh->routing_id(), location, action)); 1948 rvh->routing_id(), location, action));
1952 } 1949 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_error_info.cc ('k') | chrome/browser/ui/toolbar/toolbar_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698