ui/views/window/client_view.cc - Issue 1690133003: DialogClientView: Correct the order in which subviews are focused.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ui/views/window/client_view.cc

Issue 1690133003: DialogClientView: Correct the order in which subviews are focused. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix failing test. Created 4 years, 10 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 unified diff | Download patch

« no previous file with comments | « no previous file | ui/views/window/dialog_client_view.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ui/views/window/client_view.h"	5 #include "ui/views/window/client_view.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "ui/accessibility/ax_view_state.h"	8 #include "ui/accessibility/ax_view_state.h"

9 #include "ui/base/hit_test.h"	9 #include "ui/base/hit_test.h"

10 #include "ui/views/widget/widget.h"	10 #include "ui/views/widget/widget.h"

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 }	85 }

86	86

87 void ClientView::ViewHierarchyChanged(	87 void ClientView::ViewHierarchyChanged(

88 const ViewHierarchyChangedDetails& details) {	88 const ViewHierarchyChangedDetails& details) {

89 if (details.is_add && details.child == this) {	89 if (details.is_add && details.child == this) {

90 DCHECK(GetWidget());	90 DCHECK(GetWidget());

91 DCHECK(contents_view_); // \|contents_view_\| must be valid now!	91 DCHECK(contents_view_); // \|contents_view_\| must be valid now!

92 // Insert \|contents_view_\| at index 0 so it is first in the focus chain.	92 // Insert \|contents_view_\| at index 0 so it is first in the focus chain.

93 // (the OK/Cancel buttons are inserted before contents_view_)	93 // (the OK/Cancel buttons are inserted before contents_view_)

94 AddChildViewAt(contents_view_, 0);	94 AddChildViewAt(contents_view_, 0);

95 }	95 } else if (!details.is_add && details.child == contents_view_)
	sky 2016/02/22 16:38:57 nit {} (because this an else block of a conditiona nit {} (because this an else block of a conditional that has {} karandeepb 2016/02/22 23:40:37 Done. Show quoted text On 2016/02/22 16:38:57, sky wrote: > nit {} (because this an else block of a conditional that has {} Done.
	96 contents_view_ = nullptr;

96 }	97 }

97	98

98 } // namespace views	99 } // namespace views

OLD	NEW