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

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

Issue 6804032: Add TLS-SRP (RFC 5054) support Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: remove "httpsv" scheme, minor NSS/OpenSSL changes Created 9 years, 8 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
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 1327 matching lines...) Expand 10 before | Expand all | Expand 10 after
1338 case IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE: 1338 case IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE:
1339 OpenURL(GURL(chrome::kViewSourceScheme + std::string(":") + 1339 OpenURL(GURL(chrome::kViewSourceScheme + std::string(":") +
1340 params_.frame_url.spec()), NEW_FOREGROUND_TAB, PageTransition::LINK); 1340 params_.frame_url.spec()), NEW_FOREGROUND_TAB, PageTransition::LINK);
1341 break; 1341 break;
1342 1342
1343 case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: { 1343 case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: {
1344 // Deserialize the SSL info. 1344 // Deserialize the SSL info.
1345 NavigationEntry::SSLStatus ssl; 1345 NavigationEntry::SSLStatus ssl;
1346 if (!params_.security_info.empty()) { 1346 if (!params_.security_info.empty()) {
1347 int cert_id, cert_status, security_bits, connection_status; 1347 int cert_id, cert_status, security_bits, connection_status;
1348 string16 tls_username;
1348 SSLManager::DeserializeSecurityInfo(params_.security_info, 1349 SSLManager::DeserializeSecurityInfo(params_.security_info,
1349 &cert_id, 1350 &cert_id,
1350 &cert_status, 1351 &cert_status,
1351 &security_bits, 1352 &security_bits,
1352 &connection_status); 1353 &connection_status,
1354 &tls_username);
1353 ssl.set_cert_id(cert_id); 1355 ssl.set_cert_id(cert_id);
1354 ssl.set_cert_status(cert_status); 1356 ssl.set_cert_status(cert_status);
1355 ssl.set_security_bits(security_bits); 1357 ssl.set_security_bits(security_bits);
1356 ssl.set_connection_status(connection_status); 1358 ssl.set_connection_status(connection_status);
1359 ssl.set_tls_username(tls_username);
1357 } 1360 }
1358 source_tab_contents_->ShowPageInfo(params_.frame_url, ssl, 1361 source_tab_contents_->ShowPageInfo(params_.frame_url, ssl,
1359 false); // Don't show the history. 1362 false); // Don't show the history.
1360 break; 1363 break;
1361 } 1364 }
1362 1365
1363 case IDC_CONTENT_CONTEXT_UNDO: 1366 case IDC_CONTENT_CONTEXT_UNDO:
1364 source_tab_contents_->render_view_host()->Undo(); 1367 source_tab_contents_->render_view_host()->Undo();
1365 break; 1368 break;
1366 1369
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
1530 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages), 1533 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
1531 g_browser_process->clipboard()); 1534 g_browser_process->clipboard());
1532 } 1535 }
1533 1536
1534 void RenderViewContextMenu::MediaPlayerActionAt( 1537 void RenderViewContextMenu::MediaPlayerActionAt(
1535 const gfx::Point& location, 1538 const gfx::Point& location,
1536 const WebMediaPlayerAction& action) { 1539 const WebMediaPlayerAction& action) {
1537 source_tab_contents_->render_view_host()->MediaPlayerActionAt( 1540 source_tab_contents_->render_view_host()->MediaPlayerActionAt(
1538 location, action); 1541 location, action);
1539 } 1542 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/provisional_load_details.cc ('k') | chrome/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698