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

Unified Diff: chrome/browser/ui/android/context_menu_helper.cc

Issue 1828193002: DCHECK that jstring to C++ string conversions don't pass in null. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: braces Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/android/context_menu_helper.h ('k') | components/gcm_driver/gcm_driver_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/android/context_menu_helper.cc
diff --git a/chrome/browser/ui/android/context_menu_helper.cc b/chrome/browser/ui/android/context_menu_helper.cc
index 0dc0ade3b5cf30143008545801e34a3b02d2c3cf..b6b324bc48d9cae3c8e66fe53cbfd27d2fb35385 100644
--- a/chrome/browser/ui/android/context_menu_helper.cc
+++ b/chrome/browser/ui/android/context_menu_helper.cc
@@ -27,12 +27,11 @@ using base::android::ConvertUTF16ToJavaString;
DEFINE_WEB_CONTENTS_USER_DATA_KEY(ContextMenuHelper);
-namespace {
-
const int kShareImageMaxWidth = 2048;
const int kShareImageMaxHeight = 2048;
-} // namespace
+const char kDataReductionProxyPassthroughHeader[] =
+ "Chrome-Proxy: pass-through\r\n";
ContextMenuHelper::ContextMenuHelper(content::WebContents* web_contents)
: web_contents_(web_contents) {
@@ -108,11 +107,15 @@ ContextMenuHelper::CreateJavaContextMenuParams(
return jmenu_info;
}
-void ContextMenuHelper::OnStartDownload(JNIEnv* env,
- const JavaParamRef<jobject>& obj,
- jboolean jis_link,
- const JavaParamRef<jstring>& jheaders) {
- std::string headers(ConvertJavaStringToUTF8(env, jheaders));
+void ContextMenuHelper::OnStartDownload(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& obj,
+ jboolean jis_link,
+ jboolean jis_data_reduction_proxy_enabled) {
+ std::string headers;
+ if (jis_data_reduction_proxy_enabled)
+ headers = kDataReductionProxyPassthroughHeader;
+
content::DownloadControllerAndroid::Get()->StartContextMenuDownload(
context_menu_params_,
web_contents_,
« no previous file with comments | « chrome/browser/ui/android/context_menu_helper.h ('k') | components/gcm_driver/gcm_driver_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698