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

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: Aaaand another rebase. 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/content/web_activity.cc

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

index 35e0d71553d05cbb6ee994293641eea281eddbaf..e4eb00688ee4799156005b68775e6eb83b5bb34f 100644

--- a/athena/content/web_activity.cc

+++ b/athena/content/web_activity.cc

@@ -347,6 +347,10 @@ Activity::ActivityMediaState WebActivity::GetMediaState() {

return Activity::ACTIVITY_MEDIA_STATE_NONE;

}

+aura::Window* WebActivity::GetWindow() {

+ return !web_view_ ? NULL : web_view_->GetWidget()->GetNativeWindow();

void WebActivity::Init() {

DCHECK(web_view_);

web_view_->InstallAccelerators();

« no previous file with comments | « athena/content/web_activity.h ('k') | athena/main/athena_launcher.cc » ('j') | no next file with comments »