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

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

Issue 2748203002: Remove usage of USE_SYSTEM_PROTOBUF (Closed)
Patch Set: Rebase Created 3 years, 8 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
« no previous file with comments | « no previous file | chromeos/cryptohome/homedir_methods.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) 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/loader/chrome_resource_dispatcher_host_delegate.h" 5 #include "chrome/browser/loader/chrome_resource_dispatcher_host_delegate.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "content/public/browser/stream_info.h" 71 #include "content/public/browser/stream_info.h"
72 #include "content/public/browser/web_contents.h" 72 #include "content/public/browser/web_contents.h"
73 #include "content/public/common/resource_response.h" 73 #include "content/public/common/resource_response.h"
74 #include "extensions/features/features.h" 74 #include "extensions/features/features.h"
75 #include "net/base/load_flags.h" 75 #include "net/base/load_flags.h"
76 #include "net/base/load_timing_info.h" 76 #include "net/base/load_timing_info.h"
77 #include "net/base/request_priority.h" 77 #include "net/base/request_priority.h"
78 #include "net/http/http_response_headers.h" 78 #include "net/http/http_response_headers.h"
79 #include "net/ssl/client_cert_store.h" 79 #include "net/ssl/client_cert_store.h"
80 #include "net/url_request/url_request.h" 80 #include "net/url_request/url_request.h"
81 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
81 82
82 #if !defined(DISABLE_NACL) 83 #if !defined(DISABLE_NACL)
83 #include "chrome/browser/component_updater/pnacl_component_installer.h" 84 #include "chrome/browser/component_updater/pnacl_component_installer.h"
84 #endif 85 #endif
85 86
86 #if BUILDFLAG(ENABLE_EXTENSIONS) 87 #if BUILDFLAG(ENABLE_EXTENSIONS)
87 #include "chrome/browser/apps/app_url_redirector.h" 88 #include "chrome/browser/apps/app_url_redirector.h"
88 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h" 89 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h"
89 #include "chrome/browser/extensions/user_script_listener.h" 90 #include "chrome/browser/extensions/user_script_listener.h"
90 #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h" 91 #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h"
91 #include "extensions/browser/extension_throttle_manager.h" 92 #include "extensions/browser/extension_throttle_manager.h"
92 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" 93 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
93 #include "extensions/browser/info_map.h" 94 #include "extensions/browser/info_map.h"
94 #include "extensions/common/constants.h" 95 #include "extensions/common/constants.h"
95 #include "extensions/common/extension_urls.h" 96 #include "extensions/common/extension_urls.h"
96 #include "extensions/common/manifest_handlers/mime_types_handler.h" 97 #include "extensions/common/manifest_handlers/mime_types_handler.h"
97 #include "extensions/common/user_script.h" 98 #include "extensions/common/user_script.h"
98 #endif 99 #endif
99 100
100 #if defined(USE_SYSTEM_PROTOBUF)
101 #include <google/protobuf/repeated_field.h>
102 #else
103 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
104 #endif
105
106 #if defined(OS_ANDROID) 101 #if defined(OS_ANDROID)
107 #include "chrome/browser/android/download/intercept_download_resource_throttle.h " 102 #include "chrome/browser/android/download/intercept_download_resource_throttle.h "
108 #include "chrome/browser/android/offline_pages/background_loader_offliner.h" 103 #include "chrome/browser/android/offline_pages/background_loader_offliner.h"
109 #include "chrome/browser/android/offline_pages/downloads/resource_throttle.h" 104 #include "chrome/browser/android/offline_pages/downloads/resource_throttle.h"
110 #include "chrome/browser/loader/data_reduction_proxy_resource_throttle_android.h " 105 #include "chrome/browser/loader/data_reduction_proxy_resource_throttle_android.h "
111 #include "components/navigation_interception/intercept_navigation_delegate.h" 106 #include "components/navigation_interception/intercept_navigation_delegate.h"
112 #endif 107 #endif
113 108
114 #if defined(OS_CHROMEOS) 109 #if defined(OS_CHROMEOS)
115 #include "chrome/browser/chromeos/login/signin/merge_session_resource_throttle.h " 110 #include "chrome/browser/chromeos/login/signin/merge_session_resource_throttle.h "
(...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad, 933 base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad,
939 base::Unretained(this), url, request_loading_time)); 934 base::Unretained(this), url, request_loading_time));
940 return; 935 return;
941 } 936 }
942 937
943 std::string metric_name = (request_loading_time.InMilliseconds() < 100 ? 938 std::string metric_name = (request_loading_time.InMilliseconds() < 100 ?
944 "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow"); 939 "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow");
945 rappor::SampleDomainAndRegistryFromGURL( 940 rappor::SampleDomainAndRegistryFromGURL(
946 g_browser_process->rappor_service(), metric_name, url); 941 g_browser_process->rappor_service(), metric_name, url);
947 } 942 }
OLDNEW
« no previous file with comments | « no previous file | chromeos/cryptohome/homedir_methods.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698