V2 app support step3: Athena's NativeAppWindow

athena/extensions/chrome/extensions_delegate_impl.cc

Index: athena/extensions/chrome/extensions_delegate_impl.cc
diff --git a/athena/extensions/chrome/extensions_delegate_impl.cc b/athena/extensions/chrome/extensions_delegate_impl.cc
index 89a1a47ec337d6e270955377961b20c42c17dd20..d6b85129bddfc9b9342da8dfb4e9e2c762801b5f 100644
--- a/athena/extensions/chrome/extensions_delegate_impl.cc
+++ b/athena/extensions/chrome/extensions_delegate_impl.cc
@@ -6,7 +6,7 @@
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
-#include "athena/extensions/chrome/athena_apps_client.h"
+#include "athena/extensions/chrome/athena_chrome_apps_client.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -32,7 +32,7 @@ class ChromeExtensionsDelegate : public ExtensionsDelegate {
     extensions::AppsClient::Set(&apps_client_);
   }
 
-  virtual ~ChromeExtensionsDelegate() {}
+  virtual ~ChromeExtensionsDelegate() { extensions::AppsClient::Set(NULL); }
 
  private:
   // ExtensionsDelegate:
@@ -106,7 +106,7 @@ class ChromeExtensionsDelegate : public ExtensionsDelegate {
   // Installed extensions.
   extensions::ExtensionSet extensions_;
 
-  AthenaAppsClient apps_client_;
+  AthenaChromeAppsClient apps_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsDelegate);
 };