athena/content/app_activity_proxy.h - Issue 603033002: Get FileSelect dialog work on athena

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/content/app_activity_proxy.h

Issue 603033002: Get FileSelect dialog work on athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

Index: athena/content/app_activity_proxy.h

diff --git a/athena/content/app_activity_proxy.h b/athena/content/app_activity_proxy.h

index cdeb07e39690f9e66d70532e31c22f15dc8a629d..68db1bb00da803d0a9414393dd061569487a538a 100644

--- a/athena/content/app_activity_proxy.h

+++ b/athena/content/app_activity_proxy.h

@@ -40,6 +40,7 @@ class AppActivityProxy : public Activity,

virtual bool IsVisible() OVERRIDE;

virtual ActivityMediaState GetMediaState() OVERRIDE;

virtual aura::Window* GetWindow() OVERRIDE;

+ virtual content::WebContents* GetWebContents() OVERRIDE;

// ActivityViewModel overrides:

virtual void Init() OVERRIDE;