chrome/common/extensions/features/simple_feature.cc - Issue 22299009: Move channel-related (Chrome-specific) global state out of Feature.

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/common/extensions/features/simple_feature.cc

Issue 22299009: Move channel-related (Chrome-specific) global state out of Feature. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/common/extensions/features/simple_feature.cc

diff --git a/chrome/common/extensions/features/simple_feature.cc b/chrome/common/extensions/features/simple_feature.cc

index 676c0c6d08db7d8afc2e329b17eb724068264488..e8ee3d5fcb32bf8824ce12988527fdfc3a4f7262 100644

--- a/chrome/common/extensions/features/simple_feature.cc

+++ b/chrome/common/extensions/features/simple_feature.cc

@@ -14,6 +14,7 @@

#include "base/strings/string_util.h"

#include "base/strings/stringprintf.h"

#include "chrome/common/chrome_switches.h"

+#include "chrome/common/extensions/features/feature_channel.h"

using chrome::VersionInfo;

@@ -306,7 +307,7 @@ Feature::Availability SimpleFeature::IsAvailableToManifest(

if (max_manifest_version_ != 0 && manifest_version > max_manifest_version_)

return CreateAvailability(INVALID_MAX_MANIFEST_VERSION, type);

- if (channel_has_been_set_ && channel_ < Feature::GetCurrentChannel())

+ if (channel_has_been_set_ && channel_ < GetCurrentChannel())

return CreateAvailability(UNSUPPORTED_CHANNEL, type);

return CreateAvailability(IS_AVAILABLE, type);