chrome/browser/extensions/extension_system.cc - Issue 10854177: Only set the channel from ExtensionSystem if there hasn't been one set already.

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/extensions/extension_system.cc

Issue 10854177: Only set the channel from ExtensionSystem if there hasn't been one set already. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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

Index: chrome/browser/extensions/extension_system.cc

diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc

index 55e31a31b3683ea0b6043fdf864837934d12d320..01bba644c68af15570d44877fec13eb15ea974d9 100644

--- a/chrome/browser/extensions/extension_system.cc

+++ b/chrome/browser/extensions/extension_system.cc

@@ -51,7 +51,9 @@ namespace extensions {

ExtensionSystem::ExtensionSystem() {

- Feature::SetCurrentChannel(chrome::VersionInfo::GetChannel());

+ // Only set if it hasn't already been set (e.g. by a test).

+ if (Feature::GetCurrentChannel() == Feature::GetDefaultChannel())

+ Feature::SetCurrentChannel(chrome::VersionInfo::GetChannel());

}

ExtensionSystem::~ExtensionSystem() {

« no previous file with comments | « no previous file | chrome/common/extensions/features/feature.h » ('j') | chrome/common/extensions/features/feature.cc » ('J')