chrome/browser/ui/views/constrained_window_views.cc - Issue 10910034: Attempt 2 at: Fixes crash that occured because NativeViewHostAura::Detach was not

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: chrome/browser/ui/views/constrained_window_views.cc

Issue 10910034: Attempt 2 at: Fixes crash that occured because NativeViewHostAura::Detach was not (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: da fix Created 8 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: chrome/browser/ui/views/constrained_window_views.cc

diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc

index 53ac24a8e3d38a38909e21b2d55a59f42da0b0f6..0957a62b43920835641d04379a5c6134313fcdf8 100644

--- a/chrome/browser/ui/views/constrained_window_views.cc

+++ b/chrome/browser/ui/views/constrained_window_views.cc

@@ -640,7 +640,9 @@ void ConstrainedWindowViews::FocusConstrainedWindow() {

widget_delegate()->GetInitiallyFocusedView()->RequestFocus();

}

#if defined(USE_ASH)

- GetNativeView()->Focus();

+ // We don't necessarily have a RootWindow yet.

+ if (GetNativeView()->GetRootWindow())

+ GetNativeView()->Focus();

#endif

}

« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »