chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc - Issue 956223002: Rename DataReductionProxyUsageStats to DataReductionProxyBypassStats

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc

Issue 956223002: Rename DataReductionProxyUsageStats to DataReductionProxyBypassStats (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nits Created 5 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 | components/components_tests.gyp » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/net/spdyproxy/data_reduction_proxy_settings_android.h"	5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"

6	6

7 #include "base/android/jni_android.h"	7 #include "base/android/jni_android.h"

8 #include "base/android/jni_string.h"	8 #include "base/android/jni_string.h"

9 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"	9 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"

10 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"	10 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"

11 #include "chrome/browser/profiles/profile.h"	11 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/profiles/profile_manager.h"	12 #include "chrome/browser/profiles/profile_manager.h"

13 #include "chrome/common/pref_names.h"	13 #include "chrome/common/pref_names.h"

	14 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_bypa ss_stats.h"

14 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett ings.h"	15 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett ings.h"

15 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usag e_stats.h"

16 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"	16 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"

17 #include "jni/DataReductionProxySettings_jni.h"	17 #include "jni/DataReductionProxySettings_jni.h"

18 #include "net/proxy/proxy_server.h"	18 #include "net/proxy/proxy_server.h"

19	19

20	20

21 using base::android::ConvertUTF8ToJavaString;	21 using base::android::ConvertUTF8ToJavaString;

22 using base::android::ScopedJavaLocalRef;	22 using base::android::ScopedJavaLocalRef;

23 using data_reduction_proxy::DataReductionProxyParams;	23 using data_reduction_proxy::DataReductionProxyParams;

24 using data_reduction_proxy::DataReductionProxySettings;	24 using data_reduction_proxy::DataReductionProxySettings;

25	25

(...skipping 105 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 ProfileManager::GetActiveUserProfile());	131 ProfileManager::GetActiveUserProfile());

132 DCHECK(settings);	132 DCHECK(settings);

133 return settings;	133 return settings;

134 }	134 }

135	135

136	136

137 // Used by generated jni code.	137 // Used by generated jni code.

138 static jlong Init(JNIEnv* env, jobject obj) {	138 static jlong Init(JNIEnv* env, jobject obj) {

139 return reinterpret_cast<intptr_t>(new DataReductionProxySettingsAndroid());	139 return reinterpret_cast<intptr_t>(new DataReductionProxySettingsAndroid());

140 }	140 }

OLD	NEW