content/browser/web_contents/aura/constrained_windows_observer.cc - Issue 48113013: Re-Reland: Implement features in NativeViewHostAura for scroll end effect

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: content/browser/web_contents/aura/constrained_windows_observer.cc

Issue 48113013: Re-Reland: Implement features in NativeViewHostAura for scroll end effect Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Moved ownership of clipping_window_ solely into NHVA Created 7 years, 1 month 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: content/browser/web_contents/aura/constrained_windows_observer.cc

diff --git a/content/browser/web_contents/aura/constrained_windows_observer.cc b/content/browser/web_contents/aura/constrained_windows_observer.cc

index 4de9c7859a1eb5d93a033a6a4a10f742c659d2dd..4a66ed81d3af04ae4a5d27d42452600418969b2b 100644

--- a/content/browser/web_contents/aura/constrained_windows_observer.cc

+++ b/content/browser/web_contents/aura/constrained_windows_observer.cc

@@ -129,7 +129,9 @@ void ConstrainedWindowsObserver::OnWindowParentChanged(aura::Window* window,

window->GetRootWindow()->AddObserver(this);

}

- constrained_parent_ = parent;

+ constrained_parent_ = NULL;

+ if (parent)

+ constrained_parent_ = parent->parent();

if (constrained_parent_) {

constrained_parent_->AddObserver(this);