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

« no previous file with comments | « chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc ('k') | chrome/browser/ui/views/bookmark_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/bookmark_bar_instructions_view.cc

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

--- chrome/browser/ui/views/bookmark_bar_instructions_view.cc (revision 74231)

+++ chrome/browser/ui/views/bookmark_bar_instructions_view.cc (working copy)

@@ -38,7 +38,7 @@

gfx::Size BookmarkBarInstructionsView::GetPreferredSize() {

int ascent = 0, descent = 0, height = 0, width = 0;

- for (int i = 0; i < GetChildViewCount(); ++i) {

+ for (int i = 0; i < child_count(); ++i) {

View* view = GetChildViewAt(i);

gfx::Size pref = view->GetPreferredSize();

int baseline = view->GetBaseline();

@@ -50,7 +50,7 @@

}

width += pref.width();

}

- width += (GetChildViewCount() - 1) * kViewPadding;

+ width += (child_count() - 1) * kViewPadding;

if (ascent != 0)

height = std::max(ascent + descent, height);

return gfx::Size(width, height);

@@ -59,7 +59,7 @@

void BookmarkBarInstructionsView::Layout() {

int remaining_width = width();

int x = 0;

- for (int i = 0; i < GetChildViewCount(); ++i) {

+ for (int i = 0; i < child_count(); ++i) {

View* view = GetChildViewAt(i);

gfx::Size pref = view->GetPreferredSize();

int baseline = view->GetBaseline();