android_webview/native/aw_contents_statics.cc - Issue 279633003: Use non-static set_key interface on DataReductionProxySettings

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/native/aw_contents_statics.cc

Issue 279633003: Use non-static set_key interface on DataReductionProxySettings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 7 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 | « android_webview/browser/net/aw_url_request_context_getter.cc ('k') | chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/native/aw_contents_statics.cc

diff --git a/android_webview/native/aw_contents_statics.cc b/android_webview/native/aw_contents_statics.cc

index 29453e65241001bc693faa27aefa343f33d18a04..229df56d12c60392c577687ff47339c06b680268 100644

--- a/android_webview/native/aw_contents_statics.cc

+++ b/android_webview/native/aw_contents_statics.cc

@@ -4,6 +4,7 @@

#include "android_webview/native/aw_contents_statics.h"

+#include "android_webview/browser/aw_browser_context.h"

#include "base/android/jni_string.h"

#include "base/android/scoped_java_ref.h"

#include "base/callback.h"

@@ -49,7 +50,12 @@ void ClearClientCertPreferences(JNIEnv* env, jclass, jobject callback) {

// static

void SetDataReductionProxyKey(JNIEnv* env, jclass, jstring key) {

- DataReductionProxySettings::SetKey(ConvertJavaStringToUTF8(env, key));

+ AwBrowserContext* browser_context = AwBrowserContext::GetDefault();

+ DCHECK(browser_context);

+ DataReductionProxySettings* drp_settings =

+ browser_context->GetDataReductionProxySettings();

+ DCHECK(drp_settings);

+ drp_settings->set_key(ConvertJavaStringToUTF8(env, key));

sgurun-gerrit only 2014/05/09 17:40:26 fix the alignment?

bengr 2014/05/09 17:54:24 Done.

}

bool RegisterAwContentsStatics(JNIEnv* env) {