athena: Introduce ActivityView.

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"
@@ skipping 26 matching lines @@
   bool IsVisible() override;
   ActivityMediaState GetMediaState() override;
   aura::Window* GetWindow() override;
   content::WebContents* GetWebContents() override;
 
   // ActivityViewModel:
   void Init() override;
   SkColor GetRepresentativeColor() const override;
   base::string16 GetTitle() const override;
   gfx::ImageSkia GetIcon() const override;
+  void SetActivityView(ActivityView* activity_view) override;
   bool UsesFrame() const override;
   views::View* GetContentsView() override;
   gfx::ImageSkia GetOverviewModeImage() override;
   void PrepareContentsForOverview() override;
   void ResetContentsView() override;
 
  protected:
   // Constructor for test.
   explicit AppActivity(const std::string& app_id);
 
@@ skipping 22 matching lines @@
   ActivityState current_state_;
 
   // If known the registry which holds all activities for the associated app.
   // This object is owned by |AppRegistry| and will be a valid pointer as long
   // as this object lives.
   AppActivityRegistry* app_activity_registry_;
 
   // The content proxy.
   scoped_ptr<ContentProxy> content_proxy_;
 
+  ActivityView* activity_view_;

[oshima, 2014/11/04 22:17:04]

can you document ownership?

[sadrul, 2014/11/04 23:26:09]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(AppActivity);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_CONTENT_APP_ACTIVITY_H_