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

Side by Side Diff: content/browser/tab_contents/tab_contents.cc

Issue 7969023: For the SSL cert status, convert anonymous enum that gives bit values into a typedefed uint32. Th... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 "content/browser/tab_contents/tab_contents.h" 5 #include "content/browser/tab_contents/tab_contents.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 1023
1024 void TabContents::OnDidLoadResourceFromMemoryCache( 1024 void TabContents::OnDidLoadResourceFromMemoryCache(
1025 const GURL& url, 1025 const GURL& url,
1026 const std::string& security_info, 1026 const std::string& security_info,
1027 const std::string& http_method, 1027 const std::string& http_method,
1028 ResourceType::Type resource_type) { 1028 ResourceType::Type resource_type) {
1029 base::StatsCounter cache("WebKit.CacheHit"); 1029 base::StatsCounter cache("WebKit.CacheHit");
1030 cache.Increment(); 1030 cache.Increment();
1031 1031
1032 // Send out a notification that we loaded a resource from our memory cache. 1032 // Send out a notification that we loaded a resource from our memory cache.
1033 int cert_id = 0, cert_status = 0, security_bits = -1, connection_status = 0; 1033 int cert_id = 0;
1034 net::CertStatus cert_status = 0;
1035 int security_bits = -1;
1036 int connection_status = 0;
1034 SSLManager::DeserializeSecurityInfo(security_info, 1037 SSLManager::DeserializeSecurityInfo(security_info,
1035 &cert_id, &cert_status, 1038 &cert_id, &cert_status,
1036 &security_bits, 1039 &security_bits,
1037 &connection_status); 1040 &connection_status);
1038 LoadFromMemoryCacheDetails details(url, GetRenderProcessHost()->id(), 1041 LoadFromMemoryCacheDetails details(url, GetRenderProcessHost()->id(),
1039 cert_id, cert_status); 1042 cert_id, cert_status);
1040 1043
1041 NotificationService::current()->Notify( 1044 NotificationService::current()->Notify(
1042 content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE, 1045 content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE,
1043 Source<NavigationController>(&controller_), 1046 Source<NavigationController>(&controller_),
(...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after
2015 } 2018 }
2016 2019
2017 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) { 2020 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) {
2018 render_manager_.SwapInRenderViewHost(rvh); 2021 render_manager_.SwapInRenderViewHost(rvh);
2019 } 2022 }
2020 2023
2021 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { 2024 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
2022 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh); 2025 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
2023 rwh_view->SetSize(view()->GetContainerSize()); 2026 rwh_view->SetSize(view()->GetContainerSize());
2024 } 2027 }
OLDNEW
« no previous file with comments | « content/browser/tab_contents/provisional_load_details.h ('k') | net/base/cert_database_nss_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698