Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1228)

Unified Diff: chrome/common/extensions/features/feature.cc

Issue 10690144: Set the Feature's ChannelForTesting to Trunk during ActiveTabTest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: runtime fix Created 8 years, 5 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/common/extensions/features/feature.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/features/feature.cc
diff --git a/chrome/common/extensions/features/feature.cc b/chrome/common/extensions/features/feature.cc
index 550f9e31ce2269557d9d86ca4aff7e0b0cba4318..7aed0a8f7b8de621b0d70165f3de9ab0b637c47d 100644
--- a/chrome/common/extensions/features/feature.cc
+++ b/chrome/common/extensions/features/feature.cc
@@ -369,4 +369,11 @@ void Feature::ResetChannelForTesting() {
g_channel.Get().ResetChannelForTesting();
}
+// static
+chrome::VersionInfo::Channel Feature::GetCurrentChannel() {
+ if (g_channel_checking_enabled)
+ return g_channel.Get().GetChannel();
+ return chrome::VersionInfo::GetChannel();
+}
+
} // namespace
« no previous file with comments | « chrome/common/extensions/features/feature.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698