components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc - Issue 533003002: Use chromium version for data reduction proxy version

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: components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc

Issue 533003002: Use chromium version for data reduction proxy version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« android_webview/browser/net/aw_url_request_context_getter.cc ('K') | « components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc

diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc

index 3f1565684a729c2da104c692fa1197b957c28f9f..70460c5e751a12c3c75f9bcb509d65a8ca29d519 100644

--- a/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc

+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc

@@ -15,6 +15,7 @@

#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"

#include "components/data_reduction_proxy/common/data_reduction_proxy_headers.h"

#include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h"

+#include "components/data_reduction_proxy/common/version.h"

#include "crypto/random.h"

#include "net/proxy/proxy_server.h"

#include "net/url_request/url_request.h"

@@ -34,6 +35,15 @@ const char kClientChromeAndroid[] = "android";

const char kClientChromeIOS[] = "ios";

// static

+std::string DataReductionProxyAuthRequestHandler::ChromiumVersion() {

+#if defined(PRODUCT_VERSION)

+ return PRODUCT_VERSION;

+#else

+ return std::string();

+#endif

+// static

bool DataReductionProxyAuthRequestHandler::IsKeySetOnCommandLine() {

const CommandLine& command_line = *CommandLine::ForCurrentProcess();

return command_line.HasSwitch(