Move app_shell specific impl from athena_lib to athena_shell_lib

athena/content/content_activity_factory.h

Index: athena/content/content_activity_factory.h
diff --git a/athena/content/public/content_activity_factory.h b/athena/content/content_activity_factory.h
similarity index 71%
rename from athena/content/public/content_activity_factory.h
rename to athena/content/content_activity_factory.h
index 2d41441ae8855c468a918fab6ce0d034dc6e94f8..18c66b740c2ea4533bfe0558c03b2d952cc1ee04 100644
--- a/athena/content/public/content_activity_factory.h
+++ b/athena/content/content_activity_factory.h
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_
-#define ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_
+#ifndef ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_
+#define ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_
 
 #include "athena/activity/public/activity_factory.h"
-#include "athena/athena_export.h"
 #include "base/macros.h"
 
 namespace athena {
 
-class ATHENA_EXPORT ContentActivityFactory : public ActivityFactory {
+class ContentActivityFactory : public ActivityFactory {
  public:
   ContentActivityFactory();
   virtual ~ContentActivityFactory();
@@ -21,6 +20,7 @@ class ATHENA_EXPORT ContentActivityFactory : public ActivityFactory {
                                       const GURL& url) OVERRIDE;
   virtual Activity* CreateAppActivity(
       extensions::ShellAppWindow* app_window) OVERRIDE;
+  virtual Activity* CreateAppActivity(apps::AppWindow* app_window) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory);
@@ -28,4 +28,4 @@ class ATHENA_EXPORT ContentActivityFactory : public ActivityFactory {
 
 }  // namespace athena
 
-#endif  // ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_
+#endif  // ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_