| Index: chrome/browser/browser_process_impl.cc
|
| diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
|
| index fba82ec5dca5bf0cc28f1c23abb1e52259f294bc..53a7c90a10e24e376169436e2383353d641cce54 100644
|
| --- a/chrome/browser/browser_process_impl.cc
|
| +++ b/chrome/browser/browser_process_impl.cc
|
| @@ -123,6 +123,10 @@
|
| #include "chrome/browser/plugins/plugins_resource_service.h"
|
| #endif
|
|
|
| +#if defined(OS_MACOSX)
|
| +#include "chrome/browser/web_applications/app_shim_host_controller.h"
|
| +#endif
|
| +
|
| #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
|
| // How often to check if the persistent instance of Chrome needs to restart
|
| // to install an update.
|
| @@ -262,6 +266,10 @@ void BrowserProcessImpl::StartTearDown() {
|
| // monitor information.
|
| aura::Env::DeleteInstance();
|
| #endif
|
| +
|
| +#if defined(OS_MACOSX)
|
| + app_shim_host_controller_.reset();
|
| +#endif
|
| }
|
|
|
| void BrowserProcessImpl::PostDestroyThreads() {
|
| @@ -883,6 +891,10 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
| bookmark_prompt_controller_.reset(new BookmarkPromptController());
|
| }
|
| #endif
|
| +
|
| +#if defined(OS_MACOSX)
|
| + app_shim_host_controller_.reset(new AppShimHostController);
|
| +#endif
|
| }
|
|
|
| void BrowserProcessImpl::CreateIconManager() {
|
|
|