athena/content/shell/shell_app_activity.h - Issue 558243002: V2 app support step2 : Use NativeAppWindow for Activity's window.

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/shell/shell_app_activity.h

Issue 558243002: V2 app support step2 : Use NativeAppWindow for Activity's window. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: athena/content/shell/shell_app_activity.h

diff --git a/athena/content/shell/shell_app_activity.h b/athena/content/shell/shell_app_activity.h

index f91c555df2a6bfa224400677f37d7d1825afa032..336293e0bd66e3c0e6cdf377cf9eb222f669e931 100644

--- a/athena/content/shell/shell_app_activity.h

+++ b/athena/content/shell/shell_app_activity.h

@@ -22,8 +22,11 @@ class ShellAppActivity : public AppActivity {

virtual ~ShellAppActivity();

private:

+ // ActivityViewModel:

+ virtual views::Widget* CreateWidget() OVERRIDE;

// AppActivity:

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

+ virtual views::WebView* GetWebView() OVERRIDE;

scoped_ptr<extensions::ShellAppWindow> shell_app_window_;

« no previous file with comments | « athena/content/shell/content_activity_factory.cc ('k') | athena/content/shell/shell_app_activity.cc » ('j') | no next file with comments »