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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2539363004: Make base::Value::TYPE a scoped enum. (Closed)
Patch Set: Rebase Created 4 years 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
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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2223 matching lines...) Expand 10 before | Expand all | Expand 10 after
2234 2234
2235 Profile* profile = 2235 Profile* profile =
2236 Profile::FromBrowserContext(web_contents->GetBrowserContext()); 2236 Profile::FromBrowserContext(web_contents->GetBrowserContext());
2237 std::unique_ptr<base::Value> filter = 2237 std::unique_ptr<base::Value> filter =
2238 HostContentSettingsMapFactory::GetForProfile(profile)->GetWebsiteSetting( 2238 HostContentSettingsMapFactory::GetForProfile(profile)->GetWebsiteSetting(
2239 requesting_url, requesting_url, 2239 requesting_url, requesting_url,
2240 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, std::string(), NULL); 2240 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, std::string(), NULL);
2241 2241
2242 if (filter.get()) { 2242 if (filter.get()) {
2243 // Try to automatically select a client certificate. 2243 // Try to automatically select a client certificate.
2244 if (filter->IsType(base::Value::TYPE_DICTIONARY)) { 2244 if (filter->IsType(base::Value::Type::DICTIONARY)) {
2245 base::DictionaryValue* filter_dict = 2245 base::DictionaryValue* filter_dict =
2246 static_cast<base::DictionaryValue*>(filter.get()); 2246 static_cast<base::DictionaryValue*>(filter.get());
2247 2247
2248 const std::vector<scoped_refptr<net::X509Certificate> >& 2248 const std::vector<scoped_refptr<net::X509Certificate> >&
2249 all_client_certs = cert_request_info->client_certs; 2249 all_client_certs = cert_request_info->client_certs;
2250 for (size_t i = 0; i < all_client_certs.size(); ++i) { 2250 for (size_t i = 0; i < all_client_certs.size(); ++i) {
2251 if (CertMatchesFilter(*all_client_certs[i].get(), *filter_dict)) { 2251 if (CertMatchesFilter(*all_client_certs[i].get(), *filter_dict)) {
2252 // Use the first certificate that is matched by the filter. 2252 // Use the first certificate that is matched by the filter.
2253 delegate->ContinueWithCertificate(all_client_certs[i].get()); 2253 delegate->ContinueWithCertificate(all_client_certs[i].get());
2254 return; 2254 return;
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after
3314 render_frame_host, std::move(source), std::move(request)); 3314 render_frame_host, std::move(source), std::move(request));
3315 #else 3315 #else
3316 // Chrome's media remoting implementation depends on the Media Router 3316 // Chrome's media remoting implementation depends on the Media Router
3317 // infrastructure to identify remote sinks and provide the user interface for 3317 // infrastructure to identify remote sinks and provide the user interface for
3318 // sink selection. In the case where the Media Router is not present, simply 3318 // sink selection. In the case where the Media Router is not present, simply
3319 // drop the interface request. This will prevent code paths for media remoting 3319 // drop the interface request. This will prevent code paths for media remoting
3320 // in the renderer process from activating. 3320 // in the renderer process from activating.
3321 #endif 3321 #endif
3322 } 3322 }
3323 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) 3323 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_html_writer.cc ('k') | chrome/browser/chromeos/arc/policy/arc_policy_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698