| Index: chrome/browser/ui/views/bookmark_bar_view.cc | 
| =================================================================== | 
| --- chrome/browser/ui/views/bookmark_bar_view.cc	(revision 74231) | 
| +++ chrome/browser/ui/views/bookmark_bar_view.cc	(working copy) | 
| @@ -927,7 +927,7 @@ | 
| DCHECK(node && model_->other_node()); | 
| // Create a button for each of the children on the bookmark bar. | 
| for (int i = 0, child_count = node->GetChildCount(); i < child_count; ++i) | 
| -    AddChildView(i, CreateBookmarkButton(node->GetChild(i))); | 
| +    AddChildViewAt(CreateBookmarkButton(node->GetChild(i)), i); | 
| UpdateColors(); | 
| other_bookmarked_button_->SetVisible( | 
| model->other_node()->GetChildCount() > 0); | 
| @@ -980,7 +980,7 @@ | 
| if (!throbbing_view_ && sync_service_ && sync_service_->SetupInProgress()) { | 
| StartThrobbing(node, true); | 
| } | 
| -  AddChildView(index, CreateBookmarkButton(node)); | 
| +  AddChildViewAt(CreateBookmarkButton(node), index); | 
| UpdateColors(); | 
| Layout(); | 
| SchedulePaint(); | 
| @@ -1057,7 +1057,7 @@ | 
|  | 
| // Create the new buttons. | 
| for (int i = 0, child_count = node->GetChildCount(); i < child_count; ++i) | 
| -    AddChildView(i, CreateBookmarkButton(node->GetChild(i))); | 
| +    AddChildViewAt(CreateBookmarkButton(node->GetChild(i)), i); | 
| UpdateColors(); | 
|  | 
| Layout(); | 
| @@ -1150,7 +1150,7 @@ | 
| node = model_->GetBookmarkBarNode(); | 
| start_index = GetFirstHiddenNodeIndex(); | 
| } else { | 
| -    int button_index = GetChildIndex(view); | 
| +    int button_index = GetIndexOf(view); | 
| DCHECK_NE(-1, button_index); | 
| node = model_->GetBookmarkBarNode()->GetChild(button_index); | 
| } | 
| @@ -1175,7 +1175,7 @@ | 
| if (sender->tag() == kOtherFolderButtonTag) { | 
| node = model_->other_node(); | 
| } else { | 
| -    int index = GetChildIndex(sender); | 
| +    int index = GetIndexOf(sender); | 
| DCHECK_NE(-1, index); | 
| node = model_->GetBookmarkBarNode()->GetChild(index); | 
| } | 
| @@ -1213,7 +1213,7 @@ | 
| } else if (source != this) { | 
| // User clicked on one of the bookmark buttons, find which one they | 
| // clicked on. | 
| -    int bookmark_button_index = GetChildIndex(source); | 
| +    int bookmark_button_index = GetIndexOf(source); | 
| DCHECK(bookmark_button_index != -1 && | 
| bookmark_button_index < GetBookmarkButtonCount()); | 
| const BookmarkNode* node = | 
| @@ -1525,7 +1525,7 @@ | 
| // We contain five non-bookmark button views: other bookmarks, bookmarks | 
| // separator, chevrons (for overflow), the instruction label and the sync | 
| // error button. | 
| -  return GetChildViewCount() - 5; | 
| +  return child_count() - 5; | 
| } | 
|  | 
| void BookmarkBarView::StopThrobbing(bool immediate) { | 
| @@ -1590,7 +1590,7 @@ | 
|  | 
| gfx::Size BookmarkBarView::LayoutItems(bool compute_bounds_only) { | 
| gfx::Size prefsize; | 
| -  if (!GetParent() && !compute_bounds_only) | 
| +  if (!parent() && !compute_bounds_only) | 
| return prefsize; | 
|  | 
| int x = kLeftMargin; | 
|  |