V2 app support step3: Athena's NativeAppWindow

athena/extensions/chrome/extensions_delegate_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/extensions/public/extensions_delegate.h"
 
 #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"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/extension_urls.h"
 #include "net/base/url_util.h"
 
 namespace athena {
 namespace {
 
 class ChromeExtensionsDelegate : public ExtensionsDelegate {
  public:
   explicit ChromeExtensionsDelegate(content::BrowserContext* context)
       : extension_service_(
             extensions::ExtensionSystem::Get(context)->extension_service()) {
     extensions::AppsClient::Set(&apps_client_);
   }
 
-  virtual ~ChromeExtensionsDelegate() {}
+  virtual ~ChromeExtensionsDelegate() { extensions::AppsClient::Set(NULL); }
 
  private:
   // ExtensionsDelegate:
   virtual content::BrowserContext* GetBrowserContext() const OVERRIDE {
     return extension_service_->GetBrowserContext();
   }
   virtual const extensions::ExtensionSet& GetInstalledExtensions() OVERRIDE {
     return *extension_service_->extensions();
   }
   virtual bool LaunchApp(const std::string& app_id) OVERRIDE {
@@ skipping 53 matching lines @@
         athena::ActivityFactory::Get()->CreateWebActivity(
             GetBrowserContext(), base::UTF8ToUTF16(extension->name()), url));
   }
 
   // ExtensionService for the browser context this is created for.
   ExtensionService* extension_service_;
 
   // Installed extensions.
   extensions::ExtensionSet extensions_;
 
-  AthenaAppsClient apps_client_;
+  AthenaChromeAppsClient apps_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsDelegate);
 };
 
 }  // namespace
 
 // static
 void ExtensionsDelegate::CreateExtensionsDelegateForChrome(
     content::BrowserContext* context) {
   new ChromeExtensionsDelegate(context);
 }
 
 }  // namespace athena