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

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

Issue 3058027: Add #include utf_string_conversions.h to all files that use ASCIIToWide and... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/scoped_comptr_win.h" 10 #include "base/scoped_comptr_win.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/utf_string_conversions.h"
12 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
13 14
14 // The Windows implementation of URLSecurityManager uses WinINet/IE's 15 // The Windows implementation of URLSecurityManager uses WinINet/IE's
15 // URL security zone manager. See the MSDN page "URL Security Zones" at 16 // URL security zone manager. See the MSDN page "URL Security Zones" at
16 // http://msdn.microsoft.com/en-us/library/ms537021(VS.85).aspx for more 17 // http://msdn.microsoft.com/en-us/library/ms537021(VS.85).aspx for more
17 // info on the Internet Security Manager and Internet Zone Manager objects. 18 // info on the Internet Security Manager and Internet Zone Manager objects.
18 // 19 //
19 // On Windows, we honor the WinINet/IE settings and group policy related to 20 // On Windows, we honor the WinINet/IE settings and group policy related to
20 // URL Security Zones. See the Microsoft Knowledge Base article 182569 21 // URL Security Zones. See the Microsoft Knowledge Base article 182569
21 // "Internet Explorer security zones registry entries for advanced users" 22 // "Internet Explorer security zones registry entries for advanced users"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 // static 106 // static
106 URLSecurityManager* URLSecurityManager::Create( 107 URLSecurityManager* URLSecurityManager::Create(
107 HttpAuthFilter* whitelist) { 108 HttpAuthFilter* whitelist) {
108 // If we have a whitelist, just use that. 109 // If we have a whitelist, just use that.
109 if (whitelist) 110 if (whitelist)
110 return new URLSecurityManagerWhitelist(whitelist); 111 return new URLSecurityManagerWhitelist(whitelist);
111 return new URLSecurityManagerWin(); 112 return new URLSecurityManagerWin();
112 } 113 }
113 114
114 } // namespace net 115 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_proxy_client_socket_pool_unittest.cc ('k') | net/proxy/multi_threaded_proxy_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698