athena/test/sample_activity.h - Issue 548633005: Adding overview / layer framework to Activities so that unloaded / sleeping activities can be shown…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: athena/test/sample_activity.h

Issue 548633005: Adding overview / layer framework to Activities so that unloaded / sleeping activities can be shown… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed Created 6 years, 3 months 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

Index: athena/test/sample_activity.h

diff --git a/athena/test/sample_activity.h b/athena/test/sample_activity.h

index 989aca9661cc09c30d738172eb0a63d5f342c800..f069b7b205a7d67b8d8faa2c63eab511cb0b515c 100644

--- a/athena/test/sample_activity.h

+++ b/athena/test/sample_activity.h

@@ -7,7 +7,6 @@

#include "athena/activity/public/activity.h"

#include "athena/activity/public/activity_view_model.h"

-#include "base/memory/scoped_ptr.h"

#include "ui/gfx/image/image_skia.h"

namespace athena {

@@ -38,7 +37,6 @@ class SampleActivity : public Activity,

virtual bool UsesFrame() const OVERRIDE;

virtual views::View* GetContentsView() OVERRIDE;

virtual views::Widget* CreateWidget() OVERRIDE;

- virtual void CreateOverviewModeImage() OVERRIDE;

virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;

virtual void PrepareContentsForOverview() OVERRIDE;

virtual void ResetContentsView() OVERRIDE;

« no previous file with comments | « athena/resource_manager/resource_manager_unittest.cc ('k') | athena/test/sample_activity.cc » ('j') | no next file with comments »