diff options
| author | oshima <oshima@chromium.org> | 2014-09-02 16:31:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-02 23:34:25 +0000 |
| commit | 963c8527b331983a8f8ccb7d11aec2a50a6fcf77 (patch) | |
| tree | d875bbcbee9226f0011eead96441885f56b6d45d /chrome/browser/browser_process_impl.cc | |
| parent | f60ff9c56edd5b26c3b8ebeef8d7c1d3b30a811d (diff) | |
| download | chromium_src-963c8527b331983a8f8ccb7d11aec2a50a6fcf77.zip chromium_src-963c8527b331983a8f8ccb7d11aec2a50a6fcf77.tar.gz chromium_src-963c8527b331983a8f8ccb7d11aec2a50a6fcf77.tar.bz2 | |
Run athena on chrome
There are more work needs to be finished, but this should at least allow us to implement login UI
* Added chrome version of ExtensionsDelegate and AppActivity
* introduce use_athena gyp flag
* disabled features/code path that does not work yet on athena. Filed bugs to keep track of them.
BUG=397167
R=mukai@chromium.org, yoz@chromium.org
Review URL: https://codereview.chromium.org/514293003
Cr-Commit-Position: refs/heads/master@{#293023}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index a1147ab..75bc30f 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(); |