diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2015-01-15 16:32:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-16 00:33:38 +0000 |
| commit | afd6d92c4bd52b46fa70bab5b962b5d75f8cef55 (patch) | |
| tree | 883f517484ca8fdf2164b3d0ceafaf16c7d2e928 /chrome/browser/browser_process_impl.cc | |
| parent | 7dbc1428fa4363ff47972c2076cd4395e05e9440 (diff) | |
| download | chromium_src-afd6d92c4bd52b46fa70bab5b962b5d75f8cef55.zip chromium_src-afd6d92c4bd52b46fa70bab5b962b5d75f8cef55.tar.gz chromium_src-afd6d92c4bd52b46fa70bab5b962b5d75f8cef55.tar.bz2 | |
Remove remainder of USE_ATHENA ifdefs
BUG=440818
TEST=None
Review URL: https://codereview.chromium.org/855503002
Cr-Commit-Position: refs/heads/master@{#311776}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 387fa7c..1f70dfd 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -203,10 +203,8 @@ BrowserProcessImpl::BrowserProcessImpl( #endif #if defined(ENABLE_EXTENSIONS) -#if !defined(USE_ATHENA) // Athena sets its own instance during Athena's init process. extensions::AppWindowClient::Set(ChromeAppWindowClient::GetInstance()); -#endif extension_event_router_forwarder_ = new extensions::EventRouterForwarder; ExtensionRendererState::GetInstance()->Init(); |