Index: athena/extensions/shell/extensions_delegate_impl.cc |
diff --git a/athena/extensions/shell/extensions_delegate_impl.cc b/athena/extensions/shell/extensions_delegate_impl.cc |
index 2a02c461700850b32317085bc64feb41b07a78bf..a7cbcdf84a163eba88cc4e0cccc3be0e521fd671 100644 |
--- a/athena/extensions/shell/extensions_delegate_impl.cc |
+++ b/athena/extensions/shell/extensions_delegate_impl.cc |
@@ -3,6 +3,8 @@ |
// found in the LICENSE file. |
#include "athena/extensions/public/extensions_delegate.h" |
+ |
+#include "athena/extensions/shell/athena_shell_apps_client.h" |
#include "base/macros.h" |
#include "extensions/common/extension_set.h" |
#include "extensions/shell/browser/shell_extension_system.h" |
@@ -15,9 +17,12 @@ class ShellExtensionsDelegate : public ExtensionsDelegate { |
explicit ShellExtensionsDelegate(content::BrowserContext* context) |
: context_(context), |
extension_system_(static_cast<extensions::ShellExtensionSystem*>( |
- extensions::ExtensionSystem::Get(context))) {} |
+ extensions::ExtensionSystem::Get(context))), |
+ apps_client_(context) { |
+ extensions::AppsClient::Set(&apps_client_); |
+ } |
- virtual ~ShellExtensionsDelegate() {} |
+ virtual ~ShellExtensionsDelegate() { extensions::AppsClient::Set(NULL); } |
private: |
// ExtensionsDelegate: |
@@ -41,6 +46,8 @@ class ShellExtensionsDelegate : public ExtensionsDelegate { |
extensions::ShellExtensionSystem* extension_system_; |
extensions::ExtensionSet shell_extensions_; |
+ AthenaShellAppsClient apps_client_; |
+ |
DISALLOW_COPY_AND_ASSIGN(ShellExtensionsDelegate); |
}; |