Makes views show the 'mobile' bookmark folder where appropriate.

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

 // Copyright (c) 2011 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/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 815 matching lines @@
     bookmark_menu_ = NULL;
   else if (controller == bookmark_drop_menu_)
     bookmark_drop_menu_ = NULL;
 }
 
 void BookmarkBarView::ShowImportDialog() {
   browser_->OpenImportSettingsDialog();
 }
 
 void BookmarkBarView::Loaded(BookmarkModel* model, bool ids_reassigned) {
-  volatile int button_count = GetBookmarkButtonCount();
-  DCHECK(button_count == 0);  // If non-zero it means Load was invoked more than
-                              // once, or we didn't properly clear things.
-                              // Either of which shouldn't happen
+  // There should be no buttons. If non-zero it means Load was invoked more than
+  // once, or we didn't properly clear things. Either of which shouldn't happen.
+  DCHECK_EQ(0, GetBookmarkButtonCount());
   const BookmarkNode* node = model_->bookmark_bar_node();
-  DCHECK(node && model_->other_node());
+  DCHECK(node);
   // Create a button for each of the children on the bookmark bar.
   for (int i = 0, child_count = node->child_count(); i < child_count; ++i)
     AddChildViewAt(CreateBookmarkButton(node->GetChild(i)), i);
+  DCHECK(model_->other_node());
+  other_bookmarked_button_->SetAccessibleName(model_->other_node()->GetTitle());
+  other_bookmarked_button_->SetText(model_->other_node()->GetTitle());
   UpdateColors();
   UpdateOtherBookmarksVisibility();
   other_bookmarked_button_->SetEnabled(true);
 
   Layout();
   SchedulePaint();
 }
 
 void BookmarkBarView::BookmarkModelBeingDeleted(BookmarkModel* model) {
   // In normal shutdown The bookmark model should never be deleted before us.
@@ skipping 305 matching lines @@
 int BookmarkBarView::GetFirstHiddenNodeIndex() {
   const int bb_count = GetBookmarkButtonCount();
   for (int i = 0; i < bb_count; ++i) {
     if (!GetBookmarkButton(i)->IsVisible())
       return i;
   }
   return bb_count;
 }
 
 MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() {
-  MenuButton* button = new BookmarkFolderButton(
-      this,
-      l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OTHER_BOOKMARKED),
-      this,
-      false);
+  // Title is set in Loaded.
+  MenuButton* button = new BookmarkFolderButton(this, string16(), this, false);
   button->set_id(VIEW_ID_OTHER_BOOKMARKS);
   button->SetIcon(GetFolderIcon());
   button->set_context_menu_controller(this);
   button->set_tag(kOtherFolderButtonTag);
-  button->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OTHER_BOOKMARKED));
   return button;
 }
 
 MenuButton* BookmarkBarView::CreateOverflowButton() {
   MenuButton* button = new OverFlowButton(this);
   button->SetIcon(*ResourceBundle::GetSharedInstance().
                   GetBitmapNamed(IDR_BOOKMARK_BAR_CHEVRONS));
 
   // The overflow button's image contains an arrow and therefore it is a
   // direction sensitive image and we need to flip it if the UI layout is
@@ skipping 468 matching lines @@
               (1 - size_animation_->GetCurrentValue())));
     } else {
       prefsize.set_height(
           static_cast<int>(
               browser_defaults::kBookmarkBarHeight *
               size_animation_->GetCurrentValue()));
     }
   }
   return prefsize;
 }