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

Unified Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index 351d35a985508162f152020cee1f22be9fe04bae..f55200583c699042511198ff91d4ea7be34ff543 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -25,7 +25,6 @@
#include "chrome/browser/prerender/prerender_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_io_data.h"
-#include "chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h"
#include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h"
#include "chrome/browser/renderer_host/thread_hop_resource_throttle.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ -33,6 +32,7 @@
#include "chrome/browser/tab_contents/tab_util.h"
#include "chrome/browser/ui/login/login_prompt.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/features.h"
#include "chrome/common/url_constants.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
@@ -88,8 +88,12 @@
#include "third_party/protobuf/src/google/protobuf/repeated_field.h"
#endif
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ANDROID_JAVA_UI)
#include "chrome/browser/android/intercept_download_resource_throttle.h"
+#endif
+
+#if defined(OS_ANDROID)
+#include "chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h"
#include "components/navigation_interception/intercept_navigation_delegate.h"
#endif
@@ -424,7 +428,7 @@ void ChromeResourceDispatcherHostDelegate::DownloadStarting(
throttles->push_back(new DownloadResourceThrottle(
download_request_limiter_, info->GetWebContentsGetterForRequest(),
request->url(), request->method()));
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ANDROID_JAVA_UI)
throttles->push_back(
new chrome::InterceptDownloadResourceThrottle(
request, child_id, route_id, request_id));
« no previous file with comments | « chrome/browser/push_messaging/push_messaging_notification_manager.cc ('k') | chrome/browser/signin/chrome_signin_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698