athena/test/sample_activity.h - Issue 477523002: Athena: Adding basic resource management framework (un-/re-loading) of V2 applications

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 477523002: Athena: Adding basic resource management framework (un-/re-loading) of V2 applications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Forgot two files Created 6 years, 4 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 7f7432a3c430bc20d195bd843175ec16033e1e74..a43d60986d03f5dc83c74a36fcb915901a73fd58 100644

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

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

@@ -28,6 +28,7 @@ class SampleActivity : public Activity,

virtual ActivityState GetCurrentState() OVERRIDE;

virtual bool IsVisible() OVERRIDE;

virtual ActivityMediaState GetMediaState() OVERRIDE;

+ virtual aura::Window* GetWindow() OVERRIDE;

// athena::ActivityViewModel:

virtual void Init() OVERRIDE;

« athena/content/public/app_registry.h ('K') | « athena/main/athena_main.gyp ('k') | athena/test/sample_activity.cc » ('j') | no next file with comments »