Consolidate AppControllDelegate to ExtensionsDelegate

athena/content/app_activity.h

Index: athena/content/app_activity.h
diff --git a/athena/content/app_activity.h b/athena/content/app_activity.h
index 9984bafe890474805fea00e3c38b938d38035e10..9bacf45b550324a5ceb6f8dcbbffb9740f4fa6fa 100644
--- a/athena/content/app_activity.h
+++ b/athena/content/app_activity.h
@@ -27,7 +27,7 @@ class AppActivity : public Activity,
                     public ActivityViewModel,
                     public content::WebContentsObserver {
  public:
-  AppActivity();
+  explicit AppActivity(const std::string& app_id);
   virtual ~AppActivity();
 
   // Activity:
@@ -53,9 +53,6 @@ class AppActivity : public Activity,
                            bool explicit_set) OVERRIDE;
   virtual void DidUpdateFaviconURL(
       const std::vector<content::FaviconURL>& candidates) OVERRIDE;
-  virtual void DidStartNavigationToPendingEntry(
-        const GURL& url,
-        content::NavigationController::ReloadType reload_type) OVERRIDE;
 
  protected:
   virtual content::WebContents* GetWebContents() = 0;
@@ -64,6 +61,8 @@ class AppActivity : public Activity,
   // Register this activity with its application.
   void RegisterActivity();
 
+  const std::string app_id_;
+
   views::WebView* web_view_;
 
   // The current state for this activity.