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

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.cc

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

index e4efd897a6cfdba96dc01cb5c2de597db022a622..87d98aeaa668629f67159f5d61b3e0c887438093 100644

--- a/athena/content/app_activity_proxy.cc

+++ b/athena/content/app_activity_proxy.cc

@@ -57,6 +57,10 @@ aura::Window* AppActivityProxy::GetWindow() {

return view_->GetWidget()->GetNativeWindow();

}

+content::WebContents* AppActivityProxy::GetWebContents() {

+ return NULL;

void AppActivityProxy::Init() {

DCHECK(replaced_activity_);

// Get the content proxy to present the content.