Consolidate AppControllDelegate to ExtensionsDelegate

athena/content/content_activity_factory.h

 // 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.
 
 #ifndef ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_
 #define ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_
 
 #include "athena/activity/public/activity_factory.h"
 #include "base/macros.h"
 
 namespace athena {
 
 class ContentActivityFactory : public ActivityFactory {
  public:
   ContentActivityFactory();
   virtual ~ContentActivityFactory();
 
   // Overridden from ActivityFactory:
   virtual Activity* CreateWebActivity(content::BrowserContext* browser_context,
                                       const GURL& url) OVERRIDE;
-  virtual Activity* CreateAppActivity(
-      extensions::ShellAppWindow* app_window) OVERRIDE;
+  virtual Activity* CreateAppActivity(extensions::ShellAppWindow* app_window,
+                                      const std::string& app_id) OVERRIDE;
   virtual Activity* CreateAppActivity(apps::AppWindow* app_window) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_