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

Side by Side Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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/profiles/profile_io_data.cc ('k') | chrome/browser/ssl/ssl_blocking_page.h » ('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) 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/renderer_host/chrome_resource_dispatcher_host_delegate. h" 5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/common/extensions/extension_constants.h" 34 #include "chrome/common/extensions/extension_constants.h"
35 #include "chrome/common/extensions/user_script.h" 35 #include "chrome/common/extensions/user_script.h"
36 #include "chrome/common/render_messages.h" 36 #include "chrome/common/render_messages.h"
37 #include "content/public/browser/browser_thread.h" 37 #include "content/public/browser/browser_thread.h"
38 #include "content/public/browser/notification_service.h" 38 #include "content/public/browser/notification_service.h"
39 #include "content/public/browser/render_view_host.h" 39 #include "content/public/browser/render_view_host.h"
40 #include "content/public/browser/resource_context.h" 40 #include "content/public/browser/resource_context.h"
41 #include "content/public/browser/resource_dispatcher_host.h" 41 #include "content/public/browser/resource_dispatcher_host.h"
42 #include "content/public/browser/resource_request_info.h" 42 #include "content/public/browser/resource_request_info.h"
43 #include "net/base/load_flags.h" 43 #include "net/base/load_flags.h"
44 #include "net/base/ssl_config_service.h"
45 #include "net/http/http_response_headers.h" 44 #include "net/http/http_response_headers.h"
45 #include "net/ssl/ssl_config_service.h"
46 #include "net/url_request/url_request.h" 46 #include "net/url_request/url_request.h"
47 47
48 #if defined(ENABLE_MANAGED_USERS) 48 #if defined(ENABLE_MANAGED_USERS)
49 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h" 49 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h"
50 #endif 50 #endif
51 51
52 #if defined(USE_SYSTEM_PROTOBUF) 52 #if defined(USE_SYSTEM_PROTOBUF)
53 #include <google/protobuf/repeated_field.h> 53 #include <google/protobuf/repeated_field.h>
54 #else 54 #else
55 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" 55 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 info->GetChildID(), 452 info->GetChildID(),
453 info->GetRouteID()); 453 info->GetRouteID());
454 AppendChromeSyncGaiaHeader(request, resource_context); 454 AppendChromeSyncGaiaHeader(request, resource_context);
455 #endif 455 #endif
456 456
457 if (io_data->resource_prefetch_predictor_observer()) { 457 if (io_data->resource_prefetch_predictor_observer()) {
458 io_data->resource_prefetch_predictor_observer()->OnRequestRedirected( 458 io_data->resource_prefetch_predictor_observer()->OnRequestRedirected(
459 redirect_url, request); 459 redirect_url, request);
460 } 460 }
461 } 461 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/ssl/ssl_blocking_page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698