chrome/browser/shell_integration_mac.mm - 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/shell_integration_mac.mm

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/shell_integration_mac.mm

diff --git a/chrome/browser/shell_integration_mac.mm b/chrome/browser/shell_integration_mac.mm

index 59c0702544b38146899bb3e81f186340ff2ed4d6..9507d3df6cbb20646e6d712f206da8128f371708 100644

--- a/chrome/browser/shell_integration_mac.mm

+++ b/chrome/browser/shell_integration_mac.mm

@@ -7,13 +7,13 @@

#include "base/mac/bundle_locations.h"

#include "base/mac/foundation_util.h"

#include "base/strings/sys_string_conversions.h"

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

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

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

#import "third_party/mozilla/NSWorkspace+Utils.h"

ShellIntegration::DefaultWebClientSetPermission

ShellIntegration::CanSetAsDefaultBrowser() {

- if (chrome::VersionInfo::GetChannel() !=

- version_info::Channel::CANARY) {

+ if (chrome::GetChannel() != version_info::Channel::CANARY) {

return SET_DEFAULT_UNATTENDED;

}