ui/views/controls/webview/webview.h - Issue 398603002: athena: Handle WebContents created for new windows and create activities for these.

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: ui/views/controls/webview/webview.h

Issue 398603002: athena: Handle WebContents created for new windows and create activities for these. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Only set delegate if actual web contents was passed to SwapWebContents. Created 6 years, 5 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: ui/views/controls/webview/webview.h

diff --git a/ui/views/controls/webview/webview.h b/ui/views/controls/webview/webview.h

index 41da90999d78f388ba81f81e3b6550ba4e964638..c15bea1251fcfa37fe08df89cc4983570707bdf4 100644

--- a/ui/views/controls/webview/webview.h

+++ b/ui/views/controls/webview/webview.h

@@ -97,6 +97,11 @@ class WEBVIEW_EXPORT WebView : public View,

virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;

protected:

+ // Swaps the owned WebContents |wc_owner_| with |new_web_contents|. Returns

+ // the previously owned WebContents.

+ scoped_ptr<content::WebContents> SwapWebContents(

+ scoped_ptr<content::WebContents> new_web_contents);

// Overridden from View:

virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;

virtual void ViewHierarchyChanged(

« no previous file with comments | « athena/content/web_activity.cc ('k') | ui/views/controls/webview/webview.cc » ('j') | no next file with comments »