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

Side by Side Diff: chrome/browser/ssl/ssl_policy.cc

Issue 6598086: Update more includes that were pointing to the old locations. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 9 years, 9 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 | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ssl/ssl_policy_backend.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) 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 "chrome/browser/ssl/ssl_policy.h" 5 #include "chrome/browser/ssl/ssl_policy.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/singleton.h" 9 #include "base/singleton.h"
10 #include "base/string_piece.h" 10 #include "base/string_piece.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "chrome/browser/ssl/ssl_cert_error_handler.h" 12 #include "chrome/browser/ssl/ssl_cert_error_handler.h"
13 #include "chrome/browser/ssl/ssl_error_info.h" 13 #include "chrome/browser/ssl/ssl_error_info.h"
14 #include "chrome/browser/ssl/ssl_request_info.h" 14 #include "chrome/browser/ssl/ssl_request_info.h"
15 #include "chrome/browser/tab_contents/navigation_entry.h"
16 #include "chrome/common/jstemplate_builder.h" 15 #include "chrome/common/jstemplate_builder.h"
17 #include "chrome/common/time_format.h" 16 #include "chrome/common/time_format.h"
18 #include "chrome/common/url_constants.h" 17 #include "chrome/common/url_constants.h"
19 #include "content/browser/renderer_host/render_process_host.h" 18 #include "content/browser/renderer_host/render_process_host.h"
20 #include "content/browser/renderer_host/render_view_host.h" 19 #include "content/browser/renderer_host/render_view_host.h"
21 #include "content/browser/site_instance.h" 20 #include "content/browser/site_instance.h"
21 #include "content/browser/tab_contents/navigation_entry.h"
22 #include "content/browser/tab_contents/tab_contents.h" 22 #include "content/browser/tab_contents/tab_contents.h"
23 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
24 #include "net/base/cert_status_flags.h" 24 #include "net/base/cert_status_flags.h"
25 #include "net/base/ssl_info.h" 25 #include "net/base/ssl_info.h"
26 #include "webkit/glue/resource_type.h" 26 #include "webkit/glue/resource_type.h"
27 27
28 namespace { 28 namespace {
29 29
30 static const char kDot = '.'; 30 static const char kDot = '.';
31 31
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 217
218 entry->ssl().set_security_style(entry->url().SchemeIsSecure() ? 218 entry->ssl().set_security_style(entry->url().SchemeIsSecure() ?
219 SECURITY_STYLE_AUTHENTICATED : SECURITY_STYLE_UNAUTHENTICATED); 219 SECURITY_STYLE_AUTHENTICATED : SECURITY_STYLE_UNAUTHENTICATED);
220 } 220 }
221 221
222 void SSLPolicy::OriginRanInsecureContent(const std::string& origin, int pid) { 222 void SSLPolicy::OriginRanInsecureContent(const std::string& origin, int pid) {
223 GURL parsed_origin(origin); 223 GURL parsed_origin(origin);
224 if (parsed_origin.SchemeIsSecure()) 224 if (parsed_origin.SchemeIsSecure())
225 backend_->HostRanInsecureContent(parsed_origin.host(), pid); 225 backend_->HostRanInsecureContent(parsed_origin.host(), pid);
226 } 226 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ssl/ssl_policy_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698