views/layout/grid_layout.cc - Issue 6452011: Rework tree APIs to reflect Google style and more const-correctness....

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/layout/grid_layout.cc

Issue 6452011: Rework tree APIs to reflect Google style and more const-correctness.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 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 side-by-side diff with in-line comments

Download patch

Index: views/layout/grid_layout.cc

===================================================================

--- views/layout/grid_layout.cc (revision 74231)

+++ views/layout/grid_layout.cc (working copy)

@@ -960,9 +960,9 @@

}

void GridLayout::AddViewState(ViewState* view_state) {

- DCHECK(view_state->view && (view_state->view->GetParent() == NULL ||

- view_state->view->GetParent() == host_));

- if (!view_state->view->GetParent()) {

+ DCHECK(view_state->view && (view_state->view->parent() == NULL ||

+ view_state->view->parent() == host_));

+ if (!view_state->view->parent()) {

adding_view_ = true;

host_->AddChildView(view_state->view);

adding_view_ = false;

« no previous file with comments | « views/layout/fill_layout.cc ('k') | views/layout/grid_layout_unittest.cc » ('j') | no next file with comments »