Merge 22840 - Fix for bookmark bar text not being correct in subsequent Windo...

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/bookmark_bar_view.h"
 
 #include <limits>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/text_elider.h"
@@ skipping 525 matching lines @@
 }
 
 void BookmarkBarView::DidChangeBounds(const gfx::Rect& previous,
                                       const gfx::Rect& current) {
   Layout();
 }
 
 void BookmarkBarView::ViewHierarchyChanged(bool is_add,
                                            View* parent,
                                            View* child) {
-  if (is_add && child == this && height() > 0) {
-    // We only layout while parented. When we become parented, if our bounds
-    // haven't changed, DidChangeBounds won't get invoked and we won't layout.
-    // Therefore we always force a layout when added.
-    Layout();
+  if (is_add && child == this) {
+    // We may get inserted into a hierarchy with a profile - this typically
+    // occurs when the bar's contents get populated fast enough that the
+    // buttons are created before the bar is attached to a frame.
+    UpdateButtonColors();
+
+    if (height() > 0) {
+      // We only layout while parented. When we become parented, if our bounds
+      // haven't changed, DidChangeBounds won't get invoked and we won't layout.
+      // Therefore we always force a layout when added.
+      Layout();
+    }
   }
 }
 
 void BookmarkBarView::Paint(gfx::Canvas* canvas) {
   if (IsDetachedStyle()) {
     // Draw the background to match the new tab page.
     ThemeProvider* tp = GetThemeProvider();
     canvas->FillRectInt(
         tp->GetColor(BrowserThemeProvider::COLOR_NTP_BACKGROUND),
         0, 0, width(), height());
@@ skipping 1144 matching lines @@
     for (int i = 0; i < GetBookmarkButtonCount(); i++) {
       views::TextButton* button = GetBookmarkButton(i);
       button->SetEnabledColor(GetThemeProvider()->GetColor(
           BrowserThemeProvider::COLOR_BOOKMARK_TEXT));
     }
     other_bookmarked_button()->SetEnabledColor(GetThemeProvider()->GetColor(
           BrowserThemeProvider::COLOR_BOOKMARK_TEXT));
   }
 }