chrome/browser/component_updater/chrome_component_updater_configurator.cc - Issue 1269773002: Cleanup VersionInfo after componentization.

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: chrome/browser/component_updater/chrome_component_updater_configurator.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/device_status_collector.cc ('k') | chrome/browser/component_updater/widevine_cdm_component_installer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/component_updater/chrome_component_updater_configurator.cc

diff --git a/chrome/browser/component_updater/chrome_component_updater_configurator.cc b/chrome/browser/component_updater/chrome_component_updater_configurator.cc

index 320b1175fed37ae658af9e2fdc212335eac3522f..7a83b82313cfdf95ee103c77f52e56bbf17696bc 100644

--- a/chrome/browser/component_updater/chrome_component_updater_configurator.cc

+++ b/chrome/browser/component_updater/chrome_component_updater_configurator.cc

@@ -17,9 +17,9 @@

#include "chrome/browser/component_updater/component_patcher_operation_out_of_process.h"

#include "chrome/browser/component_updater/component_updater_url_constants.h"

#include "chrome/browser/update_client/chrome_update_query_params_delegate.h"

-#include "chrome/common/chrome_version_info.h"

#include "components/component_updater/component_updater_switches.h"

#include "components/update_client/configurator.h"

+#include "components/version_info/version_info.h"

#include "content/public/browser/browser_thread.h"

#include "net/url_request/url_request_context_getter.h"

#include "url/gurl.h"

@@ -218,7 +218,7 @@ std::vector<GURL> ChromeConfigurator::PingUrl() const {

}

base::Version ChromeConfigurator::GetBrowserVersion() const {

- return base::Version(chrome::VersionInfo().Version());

+ return base::Version(version_info::GetVersionNumber());

}

std::string ChromeConfigurator::GetChannel() const {

@@ -230,7 +230,7 @@ std::string ChromeConfigurator::GetLang() const {

}

std::string ChromeConfigurator::GetOSLongName() const {

- return chrome::VersionInfo().OSType();

+ return version_info::GetOSType();

}

std::string ChromeConfigurator::ExtraRequestParams() const {