athena/resource_manager/resource_manager_unittest.cc - 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/resource_manager/resource_manager_unittest.cc

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: Rebased, fixed resulting problems and addressed comments 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

« athena/resource_manager/delegate/resource_manager_delegate.cc ('K') | « athena/resource_manager/resource_manager_impl.cc ('k') | athena/test/sample_activity.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: athena/resource_manager/resource_manager_unittest.cc

diff --git a/athena/resource_manager/resource_manager_unittest.cc b/athena/resource_manager/resource_manager_unittest.cc

index 5f35d57f9d34aa453e7d4cbc7a02b63c991c2665..50cc5c803d04db67358447f545634d880ca004cb 100644

--- a/athena/resource_manager/resource_manager_unittest.cc

+++ b/athena/resource_manager/resource_manager_unittest.cc

@@ -55,8 +55,9 @@ class TestActivity : public Activity,

virtual bool UsesFrame() const OVERRIDE { return true; }

virtual views::View* GetContentsView() OVERRIDE { return view_; }

virtual views::Widget* CreateWidget() OVERRIDE { return NULL; }

- virtual void CreateOverviewModeImage() OVERRIDE {}

- virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE { return image_; }

+ virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE {

+ return gfx::ImageSkia();

+ }

virtual void PrepareContentsForOverview() OVERRIDE {}

virtual void ResetContentsView() OVERRIDE {}