[Athena: Cleanup] consolidate ChromeAppActivity and ShellAppActivity

athena/content/app_activity.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_APP_ACTIVITY_H_
 #define ATHENA_CONTENT_APP_ACTIVITY_H_
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "athena/content/app_activity_proxy.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/image/image_skia.h"
 
+namespace extensions {
+class AppWindow;
+}
+
 namespace views {
 class WebView;
 }
 
 namespace athena {
 
 class AppActivityRegistry;
 class ContentProxy;
 
 // The activity object for a hosted V2 application.
+// TODO(oshima): Move this to athena/extensions
 class AppActivity : public Activity,
                     public ActivityViewModel,
                     public content::WebContentsObserver {
  public:
-  explicit AppActivity(const std::string& app_id);
+  AppActivity(extensions::AppWindow* app_window, views::WebView* web_view);
 
   // Gets the content proxy so that the AppProxy can take it over.
   scoped_ptr<ContentProxy> GetContentProxy(aura::Window* window);
 
   // Activity:
   virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
   virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE;
   virtual ActivityState GetCurrentState() OVERRIDE;
   virtual bool IsVisible() OVERRIDE;
   virtual ActivityMediaState GetMediaState() OVERRIDE;
   virtual aura::Window* GetWindow() OVERRIDE;
 
   // ActivityViewModel:
   virtual void Init() OVERRIDE;
   virtual SkColor GetRepresentativeColor() const OVERRIDE;
   virtual base::string16 GetTitle() const OVERRIDE;
   virtual gfx::ImageSkia GetIcon() const OVERRIDE;
   virtual bool UsesFrame() const OVERRIDE;
+  virtual views::Widget* CreateWidget() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
   virtual void PrepareContentsForOverview() OVERRIDE;
   virtual void ResetContentsView() OVERRIDE;
 
  protected:
+  // Constructor for test.
+  explicit AppActivity(const std::string& app_id);
+
   virtual ~AppActivity();
 
+ private:
  // content::WebContentsObserver:
   virtual void TitleWasSet(content::NavigationEntry* entry,
                            bool explicit_set) OVERRIDE;
   virtual void DidUpdateFaviconURL(
       const std::vector<content::FaviconURL>& candidates) OVERRIDE;
 
-  virtual views::WebView* GetWebView() = 0;
-
- private:
   // Register this activity with its application.
   void RegisterActivity();
 
   // Hiding the contet proxy and showing the real content instead.
   void HideContentProxy();
 
   // Showing a content proxy instead of the real content to save resources.
   void ShowContentProxy();
 
   const std::string app_id_;
@@ skipping 10 matching lines @@
 
   // The content proxy.
   scoped_ptr<ContentProxy> content_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(AppActivity);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_CONTENT_APP_ACTIVITY_H_