chrome/browser/extensions/component_extensions_whitelist/whitelist.cc - Issue 2412643002: Set enable_hangout_services_extension from branding.

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/component_extensions_whitelist/whitelist.cc

Issue 2412643002: Set enable_hangout_services_extension from branding. (Closed)

Patch Set: Fix Created 4 years, 2 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/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

index 8e659145f607934149aa5c25c2c7a378b6ab2f6b..ffd0a5730587cbec3262decbcd05f061f7277394 100644

--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

@@ -84,7 +84,7 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {

#if defined(ENABLE_GOOGLE_NOW)

case IDR_GOOGLE_NOW_MANIFEST:

#endif

-#if defined(GOOGLE_CHROME_BUILD) || BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)

+#if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)

case IDR_HANGOUT_SERVICES_MANIFEST:

#endif

#if defined(ENABLE_HOTWORDING)