Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1625)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/content/web_activity.h

Issue 694413005: athena: Introduce ActivityView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« athena/content/app_activity_unittest.cc ('K') | « athena/content/app_activity_unittest.cc ('k') | athena/content/web_activity.cc » ('j') | athena/content/web_activity.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/web_activity.h
diff --git a/athena/content/web_activity.h b/athena/content/web_activity.h
index d3ee98d9dacc6a7f9cd29a86cd9145b2eaf01236..341aa715ab6cc2c36eed2364f3dc0a2a05c4d0d1 100644
--- a/athena/content/web_activity.h
+++ b/athena/content/web_activity.h
@@ -62,6 +62,7 @@ class WebActivity : public Activity,
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;
@@ -105,6 +106,8 @@ class WebActivity : public Activity,
// The content proxy.
scoped_ptr<ContentProxy> content_proxy_;
+ ActivityView* activity_view_;
oshima 2014/11/04 22:17:04 ditto
sadrul 2014/11/04 23:26:09 Done.
+
base::WeakPtrFactory<WebActivity> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(WebActivity);
« athena/content/app_activity_unittest.cc ('K') | « athena/content/app_activity_unittest.cc ('k') | athena/content/web_activity.cc » ('j') | athena/content/web_activity.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698