chrome/browser/browser_process_impl.cc - Issue 514293003: Run athena on chrome

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

Issue 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed comments, rebase Created 6 years, 3 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/browser_process_impl.cc

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc

index a1147ab15b140671211c5da2e5c4d3a9a277f1e7..75bc30f5f5733073017df50f8d18829230b2e9bc 100644

--- a/chrome/browser/browser_process_impl.cc

+++ b/chrome/browser/browser_process_impl.cc

@@ -200,7 +200,10 @@ BrowserProcessImpl::BrowserProcessImpl(

#endif

#if defined(ENABLE_EXTENSIONS)

+#if !defined(USE_ATHENA)

+ // Athena sets its own instance during Athena's init process.

extensions::AppsClient::Set(ChromeAppsClient::GetInstance());

+#endif

extension_event_router_forwarder_ = new extensions::EventRouterForwarder;

ExtensionRendererState::GetInstance()->Init();

« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »