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

Side by Side Diff: net/http/url_security_manager_win.cc

Issue 6362186595172352: net: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and revert nss_ocsp.cc changes Created 7 years, 5 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
« no previous file with comments | « net/http/url_security_manager_unittest.cc ('k') | net/ocsp/nss_ocsp.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "net/http/url_security_manager.h" 5 #include "net/http/url_security_manager.h"
6 6
7 #include <urlmon.h> 7 #include <urlmon.h>
8 #pragma comment(lib, "urlmon.lib") 8 #pragma comment(lib, "urlmon.lib")
9 9
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "base/win/scoped_comptr.h" 12 #include "base/win/scoped_comptr.h"
13 #include "googleurl/src/gurl.h"
14 #include "net/http/http_auth_filter.h" 13 #include "net/http/http_auth_filter.h"
14 #include "url/gurl.h"
15 15
16 // The Windows implementation of URLSecurityManager uses WinINet/IE's 16 // The Windows implementation of URLSecurityManager uses WinINet/IE's
17 // URL security zone manager. See the MSDN page "URL Security Zones" at 17 // URL security zone manager. See the MSDN page "URL Security Zones" at
18 // http://msdn.microsoft.com/en-us/library/ms537021(VS.85).aspx for more 18 // http://msdn.microsoft.com/en-us/library/ms537021(VS.85).aspx for more
19 // info on the Internet Security Manager and Internet Zone Manager objects. 19 // info on the Internet Security Manager and Internet Zone Manager objects.
20 // 20 //
21 // On Windows, we honor the WinINet/IE settings and group policy related to 21 // On Windows, we honor the WinINet/IE settings and group policy related to
22 // URL Security Zones. See the Microsoft Knowledge Base article 182569 22 // URL Security Zones. See the Microsoft Knowledge Base article 182569
23 // "Internet Explorer security zones registry entries for advanced users" 23 // "Internet Explorer security zones registry entries for advanced users"
24 // (http://support.microsoft.com/kb/182569) for more info on these registry 24 // (http://support.microsoft.com/kb/182569) for more info on these registry
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 const HttpAuthFilter* whitelist_default, 128 const HttpAuthFilter* whitelist_default,
129 const HttpAuthFilter* whitelist_delegate) { 129 const HttpAuthFilter* whitelist_delegate) {
130 // If we have a whitelist, just use that. 130 // If we have a whitelist, just use that.
131 if (whitelist_default) 131 if (whitelist_default)
132 return new URLSecurityManagerWhitelist(whitelist_default, 132 return new URLSecurityManagerWhitelist(whitelist_default,
133 whitelist_delegate); 133 whitelist_delegate);
134 return new URLSecurityManagerWin(whitelist_delegate); 134 return new URLSecurityManagerWin(whitelist_delegate);
135 } 135 }
136 136
137 } // namespace net 137 } // namespace net
OLDNEW
« no previous file with comments | « net/http/url_security_manager_unittest.cc ('k') | net/ocsp/nss_ocsp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698