chrome/browser/extensions/component_loader.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_loader.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:

Index: chrome/browser/extensions/component_loader.cc

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

index fdabd8f9179f8fa4adc9870e53a2473fa10f8367..af68b8d67d8c3051c3ed9bbcc05f222427bfcf15 100644

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

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

@@ -336,7 +336,7 @@ void ComponentLoader::AddWebstoreWidgetExtension() {

}

void ComponentLoader::AddHangoutServicesExtension() {

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

+#if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)

Add(IDR_HANGOUT_SERVICES_MANIFEST,

base::FilePath(FILE_PATH_LITERAL("hangout_services")));

#endif