chrome/common/extensions/chrome_extensions_client.cc - Issue 2137463003: [Extensions] Move Feature channel code into //extensions

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/chrome_extensions_client.cc

Issue 2137463003: [Extensions] Move Feature channel code into //extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Test fix Created 4 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/api/storage/storage_schema_manifest_handler_unittest.cc ('k') | chrome/common/extensions/features/chrome_channel_feature_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/chrome_extensions_client.cc

diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc

index 5d3b71712eef5854dbc895ccf769987220ad8e78..a261245bbced8116d515dcc9facd9335866ab3dd 100644

--- a/chrome/common/extensions/chrome_extensions_client.cc

+++ b/chrome/common/extensions/chrome_extensions_client.cc

@@ -16,8 +16,6 @@

#include "chrome/common/extensions/api/generated_schemas.h"

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

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

-#include "chrome/common/extensions/features/chrome_channel_feature_filter.h"

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

#include "chrome/common/extensions/manifest_handlers/theme_handler.h"

#include "chrome/common/url_constants.h"

#include "chrome/grit/chromium_strings.h"

@@ -35,6 +33,7 @@

#include "extensions/common/extension_urls.h"

#include "extensions/common/features/api_feature.h"

#include "extensions/common/features/behavior_feature.h"

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

#include "extensions/common/features/feature_provider.h"

#include "extensions/common/features/json_feature_provider.h"

#include "extensions/common/features/json_feature_provider_source.h"

@@ -66,9 +65,8 @@ const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh";

template <class FeatureClass>

SimpleFeature* CreateFeature() {

- SimpleFeature* feature = new FeatureClass;

- feature->AddFilter(std::unique_ptr<SimpleFeatureFilter>(

- new ChromeChannelFeatureFilter(feature)));

+ SimpleFeature* feature = new FeatureClass();

+ feature->set_check_channel(true);

return feature;

}