chrome/browser/chromeos/chrome_browser_main_chromeos.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/chromeos/chrome_browser_main_chromeos.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:

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index 143e14ea1b894c28232e4d98a2d1113235150605..ec7128d63895be27186629870596165a0935fb45 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -76,10 +76,10 @@

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

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

#include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h"

+#include "chrome/common/channel_info.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/logging_chrome.h"

#include "chrome/common/pref_names.h"

#include "chromeos/audio/audio_devices_pref_handler_impl.h"

@@ -296,7 +296,7 @@ void ChromeBrowserMainPartsChromeos::PreEarlyInitialization() {

const char kChromeOSReleaseTrack[] = "CHROMEOS_RELEASE_TRACK";

std::string channel;

if (base::SysInfo::GetLsbReleaseValue(kChromeOSReleaseTrack, &channel))

- chrome::VersionInfo::SetChannel(channel);

+ chrome::SetChannel(channel);

#endif

ChromeBrowserMainPartsLinux::PreEarlyInitialization();