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

Side by Side Diff: chrome/browser/ui/webui/options/certificate_manager_handler.cc

Issue 17948002: Update Linux to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/options/certificate_manager_handler.h" 5 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 return l10n_util::GetStringUTF8( 107 return l10n_util::GetStringUTF8(
108 IDS_CERT_MANAGER_ERROR_CERT_ALREADY_EXISTS); 108 IDS_CERT_MANAGER_ERROR_CERT_ALREADY_EXISTS);
109 default: 109 default:
110 return l10n_util::GetStringUTF8(IDS_CERT_MANAGER_UNKNOWN_ERROR); 110 return l10n_util::GetStringUTF8(IDS_CERT_MANAGER_UNKNOWN_ERROR);
111 } 111 }
112 } 112 }
113 113
114 // Struct to bind the Equals member function to an object for use in find_if. 114 // Struct to bind the Equals member function to an object for use in find_if.
115 struct CertEquals { 115 struct CertEquals {
116 explicit CertEquals(const net::X509Certificate* cert) : cert_(cert) {} 116 explicit CertEquals(const net::X509Certificate* cert) : cert_(cert) {}
117 bool operator()(const net::X509Certificate* cert) const { 117 bool operator()(const scoped_refptr<net::X509Certificate> cert) const {
118 return cert_->Equals(cert); 118 return cert_->Equals(cert.get());
119 } 119 }
120 const net::X509Certificate* cert_; 120 const net::X509Certificate* cert_;
121 }; 121 };
122 122
123 #if defined(OS_CHROMEOS) 123 #if defined(OS_CHROMEOS)
124 net::CertificateList CopyPolicyWebTrustCerts( 124 net::CertificateList CopyPolicyWebTrustCerts(
125 net::CertTrustAnchorProvider* provider) { 125 net::CertTrustAnchorProvider* provider) {
126 // Return a copy. 126 // Return a copy.
127 return provider->GetAdditionalTrustAnchors(); 127 return provider->GetAdditionalTrustAnchors();
128 } 128 }
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady", 1146 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
1147 ready); 1147 ready);
1148 } 1148 }
1149 #endif 1149 #endif
1150 1150
1151 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { 1151 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
1152 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(); 1152 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
1153 } 1153 }
1154 1154
1155 } // namespace options 1155 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc ('k') | chrome/browser/ui/webui/policy_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698