chrome/browser/extensions/extension_system.cc - Issue 10826199: Properly propagate the current Chrome channel into the Feature system on the

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 10826199: Properly propagate the current Chrome channel into the Feature system on the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: make the default stable 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

« no previous file with comments | « chrome/browser/extensions/extension_browsertest.cc ('k') | chrome/browser/extensions/script_badge_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_system.cc

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

index b451ab02005721d23331f94c8df11fdd302e5d42..8b8756ccec5a2a5c91dc25be9b6c660d17571a91 100644

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

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

@@ -36,6 +36,7 @@

#include "chrome/browser/ui/webui/chrome_url_data_manager.h"

#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"

#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/features/feature.h"

#include "chrome/common/pref_names.h"

@@ -50,10 +51,7 @@ namespace extensions {

ExtensionSystem::ExtensionSystem() {

- // In lieu of a way for Feature to check whether it's running on the browser

- // process, tell it.

- // See http://crbug.com/126535.

- Feature::SetChannelCheckingEnabled(true);

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

}

ExtensionSystem::~ExtensionSystem() {