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

Side by Side Diff: chrome/browser/tab_contents/tab_contents.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 "chrome/browser/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1588 matching lines...) Expand 10 before | Expand all | Expand 10 after
1599 void TabContents::OnDidLoadResourceFromMemoryCache( 1599 void TabContents::OnDidLoadResourceFromMemoryCache(
1600 const GURL& url, 1600 const GURL& url,
1601 const std::string& frame_origin, 1601 const std::string& frame_origin,
1602 const std::string& main_frame_origin, 1602 const std::string& main_frame_origin,
1603 const std::string& security_info) { 1603 const std::string& security_info) {
1604 static base::StatsCounter cache("WebKit.CacheHit"); 1604 static base::StatsCounter cache("WebKit.CacheHit");
1605 cache.Increment(); 1605 cache.Increment();
1606 1606
1607 // Send out a notification that we loaded a resource from our memory cache. 1607 // Send out a notification that we loaded a resource from our memory cache.
1608 int cert_id = 0, cert_status = 0, security_bits = -1, connection_status = 0; 1608 int cert_id = 0, cert_status = 0, security_bits = -1, connection_status = 0;
1609 string16 tls_username;
1609 SSLManager::DeserializeSecurityInfo(security_info, 1610 SSLManager::DeserializeSecurityInfo(security_info,
1610 &cert_id, &cert_status, 1611 &cert_id, &cert_status,
1611 &security_bits, 1612 &security_bits,
1612 &connection_status); 1613 &connection_status,
1614 &tls_username);
1613 LoadFromMemoryCacheDetails details(url, frame_origin, main_frame_origin, 1615 LoadFromMemoryCacheDetails details(url, frame_origin, main_frame_origin,
1614 GetRenderProcessHost()->id(), cert_id, 1616 GetRenderProcessHost()->id(), cert_id,
1615 cert_status); 1617 cert_status, tls_username);
1616 1618
1617 NotificationService::current()->Notify( 1619 NotificationService::current()->Notify(
1618 NotificationType::LOAD_FROM_MEMORY_CACHE, 1620 NotificationType::LOAD_FROM_MEMORY_CACHE,
1619 Source<NavigationController>(&controller_), 1621 Source<NavigationController>(&controller_),
1620 Details<LoadFromMemoryCacheDetails>(&details)); 1622 Details<LoadFromMemoryCacheDetails>(&details));
1621 } 1623 }
1622 1624
1623 void TabContents::OnDidDisplayInsecureContent() { 1625 void TabContents::OnDidDisplayInsecureContent() {
1624 displayed_insecure_content_ = true; 1626 displayed_insecure_content_ = true;
1625 SSLManager::NotifySSLInternalStateChanged(); 1627 SSLManager::NotifySSLInternalStateChanged();
(...skipping 1502 matching lines...) Expand 10 before | Expand all | Expand 10 after
3128 } 3130 }
3129 3131
3130 bool TabContents::MaybeUsePreloadedPage(const GURL& url) { 3132 bool TabContents::MaybeUsePreloadedPage(const GURL& url) {
3131 PrerenderManager* pm = profile()->GetPrerenderManager(); 3133 PrerenderManager* pm = profile()->GetPrerenderManager();
3132 if (pm != NULL) { 3134 if (pm != NULL) {
3133 if (pm->MaybeUsePreloadedPage(this, url)) 3135 if (pm->MaybeUsePreloadedPage(this, url))
3134 return true; 3136 return true;
3135 } 3137 }
3136 return false; 3138 return false;
3137 } 3139 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698