views/widget/widget.h - Issue 7466017: Fixes crash introduced by fix for 11229. The fix for 11229 made it so

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: views/widget/widget.h

Issue 7466017: Fixes crash introduced by fix for 11229. The fix for 11229 made it so (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 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:

Index: views/widget/widget.h

diff --git a/views/widget/widget.h b/views/widget/widget.h

index e71f1bacd09c4e217cf53d1ef53ffb7842e76371..15868ea0b1169e10165fc2b3d67eb219815157ad 100644

--- a/views/widget/widget.h

+++ b/views/widget/widget.h

@@ -482,7 +482,7 @@ class Widget : public internal::NativeWidgetDelegate,

const_cast<const Widget*>(this)->client_view());

}

const ClientView* client_view() const {

- return non_client_view()->client_view();

+ return non_client_view() ? non_client_view()->client_view() : NULL;

Peter Kasting 2011/07/20 23:09:40 Nit: Might as well use |non_client_view_| directly

}

#if defined(UNIT_TEST)

« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »