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

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

Issue 430643002: Correcting the version field in the Chrome-Proxy header to be the chromium build and patch number. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing Lei comments Created 6 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_chrome_settings.h" 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
6 6
7 #include "base/strings/string_split.h"
7 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator. h" 9 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator. h"
9 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/profiles/profile_manager.h" 11 #include "chrome/browser/profiles/profile_manager.h"
12 #include "chrome/common/chrome_version_info.h"
13 #include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_requ est_handler.h"
11 #include "components/data_reduction_proxy/browser/data_reduction_proxy_configura tor.h" 14 #include "components/data_reduction_proxy/browser/data_reduction_proxy_configura tor.h"
12 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h" 15 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
13 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings. h" 16 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings. h"
14 17
15 using data_reduction_proxy::DataReductionProxyParams; 18 using data_reduction_proxy::DataReductionProxyParams;
16 using data_reduction_proxy::DataReductionProxySettings; 19 using data_reduction_proxy::DataReductionProxySettings;
17 20
18 DataReductionProxyChromeSettings::DataReductionProxyChromeSettings( 21 DataReductionProxyChromeSettings::DataReductionProxyChromeSettings(
19 DataReductionProxyParams* params) : DataReductionProxySettings(params) { 22 DataReductionProxyParams* params) : DataReductionProxySettings(params) {
20 } 23 }
(...skipping 10 matching lines...) Expand all
31 configurator(new DataReductionProxyChromeConfigurator(prefs)); 34 configurator(new DataReductionProxyChromeConfigurator(prefs));
32 SetProxyConfigurator(configurator.Pass()); 35 SetProxyConfigurator(configurator.Pass());
33 DataReductionProxySettings::InitDataReductionProxySettings( 36 DataReductionProxySettings::InitDataReductionProxySettings(
34 prefs, 37 prefs,
35 g_browser_process->local_state(), 38 g_browser_process->local_state(),
36 ProfileManager::GetActiveUserProfile()->GetRequestContext()); 39 ProfileManager::GetActiveUserProfile()->GetRequestContext());
37 40
38 SetDataReductionProxyAlternativeEnabled( 41 SetDataReductionProxyAlternativeEnabled(
39 DataReductionProxyParams::IsIncludedInAlternativeFieldTrial()); 42 DataReductionProxyParams::IsIncludedInAlternativeFieldTrial());
40 } 43 }
44
45 // static
46 std::string DataReductionProxyChromeSettings::GetBuildAndPatchNumber() {
47 chrome::VersionInfo version_info;
48 std::vector<std::string> version_parts;
49 base::SplitString(version_info.Version(), '.', &version_parts);
50 if (version_parts.size() != 4)
51 return "";
52 return version_parts[2] + version_parts[3];
53 }
54
55 // static
56 std::string DataReductionProxyChromeSettings::GetClient() {
57 #if defined(OS_ANDROID)
58 return data_reduction_proxy::kClientChromeAndroid;
59 #elif defined(OS_IOS)
60 return data_reduction_proxy::kClientChromeIOS;
61 #else
62 return "";
63 #endif
64 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698