Mac: Add a shortcut to open the Apps page from the bookmark bar.

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

 // Copyright (c) 2012 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 939 matching lines @@
   // 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);
   // 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());
+  apps_page_shortcut_->SetAccessibleName(model_->apps_node()->GetTitle());
+  apps_page_shortcut_->SetText(model_->apps_node()->GetTitle());
   UpdateColors();
   UpdateOtherBookmarksVisibility();
   other_bookmarked_button_->SetEnabled(true);
-
+  UpdateAppsPageShortcutVisibility();
+  apps_page_shortcut_->SetEnabled(true);
   Layout();
   SchedulePaint();
 }
 
 void BookmarkBarView::BookmarkModelBeingDeleted(BookmarkModel* model) {
   // In normal shutdown The bookmark model should never be deleted before us.
   // When X exits suddenly though, it can happen, This code exists
   // to check for regressions in shutdown code and not crash.
   if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers())
     NOTREACHED();
@@ skipping 243 matching lines @@
   // they are added matches the visual order.
   overflow_button_ = CreateOverflowButton();
   AddChildView(overflow_button_);
 
   other_bookmarked_button_ = CreateOtherBookmarkedButton();
   // We'll re-enable when the model is loaded.
   other_bookmarked_button_->SetEnabled(false);
   AddChildView(other_bookmarked_button_);
 
   apps_page_shortcut_ = CreateAppsPageShortcutButton();
+  // We'll re-enable when the model is loaded.
+  other_bookmarked_button_->SetEnabled(false);
   AddChildView(apps_page_shortcut_);
   profile_pref_registrar_.Init(browser_->profile()->GetPrefs());
   profile_pref_registrar_.Add(
       prefs::kShowAppsShortcutInBookmarkBar,
       base::Bind(&BookmarkBarView::OnAppsPageShortcutVisibilityChanged,
       base::Unretained(this)));
-  apps_page_shortcut_->SetVisible(ShouldShowAppsShortcut());
 
   bookmarks_separator_view_ = new ButtonSeparatorView();
   AddChildView(bookmarks_separator_view_);
   UpdateBookmarksSeparatorVisibility();
 
   instructions_ = new BookmarkBarInstructionsView(this);
   AddChildView(instructions_);
 
   set_context_menu_controller(this);
 
@@ skipping 76 matching lines @@
   } else {
     views::MenuButton* button = new BookmarkFolderButton(
         this, node->GetTitle(), this, false);
     button->SetIcon(GetFolderIcon());
     ConfigureButton(node, button);
     return button;
   }
 }
 
 views::TextButton* BookmarkBarView::CreateAppsPageShortcutButton() {
-  views::TextButton* button = new ShortcutButton(
-      this, l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME));
+  views::TextButton* button = new ShortcutButton(this, string16());
   button->SetTooltipText(l10n_util::GetStringUTF16(
       IDS_BOOKMARK_BAR_APPS_SHORTCUT_TOOLTIP));
   button->set_id(VIEW_ID_BOOKMARK_BAR_ELEMENT);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   button->SetIcon(*rb.GetImageSkiaNamed(IDR_WEBSTORE_ICON_16));
   button->set_context_menu_controller(this);
   button->set_tag(kAppsShortcutButtonTag);
   return button;
 }
 
@@ skipping 309 matching lines @@
 void BookmarkBarView::UpdateOtherBookmarksVisibility() {
   bool has_other_children = !model_->other_node()->empty();
   if (has_other_children == other_bookmarked_button_->visible())
     return;
   other_bookmarked_button_->SetVisible(has_other_children);
   UpdateBookmarksSeparatorVisibility();
   Layout();
   SchedulePaint();
 }
 
+void BookmarkBarView::UpdateAppsPageShortcutVisibility() {
+  bool visible = model_->IsLoaded() &&
+      chrome::search::IsInstantExtendedAPIEnabled() &&
+          browser_->profile()->GetPrefs()->GetBoolean(
+              prefs::kShowAppsShortcutInBookmarkBar);
+  if (visible == apps_page_shortcut_->visible())
+    return;
+  apps_page_shortcut_->SetVisible(visible);
+  UpdateBookmarksSeparatorVisibility();
+  Layout();
+  SchedulePaint();
+}
+
 void BookmarkBarView::UpdateBookmarksSeparatorVisibility() {
   // Ash does not paint the bookmarks separator line because it looks odd on
   // the flat background.  We keep it present for layout, but don't draw it.
   bookmarks_separator_view_->SetVisible(
       browser_->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH &&
       (other_bookmarked_button_->visible() ||
           apps_page_shortcut_->visible()));
 }
 
 gfx::Size BookmarkBarView::LayoutItems(bool compute_bounds_only) {
@@ skipping 131 matching lines @@
     } else {
       prefsize.set_height(
           static_cast<int>(
               browser_defaults::kBookmarkBarHeight *
               size_animation_->GetCurrentValue()));
     }
   }
   return prefsize;
 }
 
-bool BookmarkBarView::ShouldShowAppsShortcut() const {
-  return chrome::search::IsInstantExtendedAPIEnabled() &&
-      browser_->profile()->GetPrefs()->GetBoolean(
-          prefs::kShowAppsShortcutInBookmarkBar);
-}
-
 void BookmarkBarView::OnAppsPageShortcutVisibilityChanged() {
   DCHECK(apps_page_shortcut_);
-  apps_page_shortcut_->SetVisible(ShouldShowAppsShortcut());
-  UpdateBookmarksSeparatorVisibility();
-  Layout();
+  UpdateAppsPageShortcutVisibility();
 }