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

chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.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_context_menu_controller_views.h"
 
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "ui/views/widget/widget.h"
 
 using content::PageNavigator;
 using content::UserMetricsAction;
 
@@ skipping 109 matching lines @@
           profile_,
           BookmarkEditor::EditDetails::AddFolder(parent, index),
           BookmarkEditor::SHOW_TREE);
       break;
     }
 
     case IDC_BOOKMARK_BAR_ALWAYS_SHOW:
       chrome::ToggleBookmarkBarWhenVisible(profile_);
       break;
 
+    case IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT: {
+      PrefService* prefs = PrefServiceFromBrowserContext(profile_);

[Alexei Svitkine (slow), 2013/02/25 21:13:29]

Shouldn't this use profile_->GetPrefs() like elsewhere in this file?

[MAD, 2013/02/25 21:41:01]

Done.

+      prefs->SetBoolean(
+          prefs::kShowAppsShortcutInBookmarkBar,
+          !prefs->GetBoolean(prefs::kShowAppsShortcutInBookmarkBar));
+      break;
+    }
+
     case IDC_BOOKMARK_MANAGER: {
       content::RecordAction(UserMetricsAction("ShowBookmarkManager"));
       if (selection_.size() != 1)
         chrome::ShowBookmarkManager(browser_);
       else if (selection_[0]->is_folder())
         chrome::ShowBookmarkManagerForNode(browser_, selection_[0]->id());
       else if (parent_)
         chrome::ShowBookmarkManagerForNode(browser_, parent_->id());
       else
         chrome::ShowBookmarkManager(browser_);
@@ skipping 20 matching lines @@
       bookmark_utils::PasteFromClipboard(model, paste_target, index);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
 bool BookmarkContextMenuControllerViews::IsItemChecked(int id) const {
-  DCHECK_EQ(IDC_BOOKMARK_BAR_ALWAYS_SHOW, id);
-  return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
+  if (id == IDC_BOOKMARK_BAR_ALWAYS_SHOW)
+    return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
+
+  DCHECK_EQ(IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT, id);
+  return profile_->GetPrefs()->GetBoolean(
+      prefs::kShowAppsShortcutInBookmarkBar);

[Alexei Svitkine (slow), 2013/02/25 21:13:29]

What calls this? I am wondering if this should be returning false if
InstantEnabled is off. Or is it not an issue when the item wasn't added in that
case? (If so, perhaps add a dcheck that instantextended isn't on.)

[MAD, 2013/02/25 21:41:01]

Done.

 }
 
 bool BookmarkContextMenuControllerViews::IsCommandEnabled(int id) const {
   bool is_root_node = selection_.size() == 1 &&
                       selection_[0]->parent() == model_->root_node();
   bool can_edit =
       profile_->GetPrefs()->GetBoolean(prefs::kEditBookmarksEnabled);
   IncognitoModePrefs::Availability incognito_avail =
       IncognitoModePrefs::GetAvailability(profile_->GetPrefs());
   switch (id) {
@@ skipping 22 matching lines @@
 
     case IDC_BOOKMARK_BAR_NEW_FOLDER:
     case IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK:
       return can_edit && bookmark_utils::GetParentForNewNodes(
           parent_, selection_, NULL) != NULL;
 
     case IDC_BOOKMARK_BAR_ALWAYS_SHOW:
       return !profile_->GetPrefs()->IsManagedPreference(
           prefs::kShowBookmarkBar);
 
+    case IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT:
+      return !profile_->GetPrefs()->IsManagedPreference(
+          prefs::kShowAppsShortcutInBookmarkBar);
+
     case IDC_COPY:
     case IDC_CUT:
       return !selection_.empty() && !is_root_node &&
              (id == IDC_COPY || can_edit);
 
     case IDC_PASTE:
       // Paste to selection from the Bookmark Bar, to parent_ everywhere else
       return can_edit &&
              ((!selection_.empty() &&
                bookmark_utils::CanPasteFromClipboard(selection_[0])) ||
@@ skipping 38 matching lines @@
                                  IDS_BOOKMARK_BAR_REMOVE);
 
   delegate_->AddSeparator();
   delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK,
                                  IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK);
   delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_NEW_FOLDER,
                                  IDS_BOOKMARK_BAR_NEW_FOLDER);
 
   delegate_->AddSeparator();
   delegate_->AddItemWithStringId(IDC_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
+  if (chrome::search::IsInstantExtendedAPIEnabled(profile_)) {
+    delegate_->AddCheckboxItem(IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT,
+                               IDS_BOOKMARK_BAR_SHOW_APPS_SHORTCUT);
+  }
   delegate_->AddCheckboxItem(IDC_BOOKMARK_BAR_ALWAYS_SHOW,
                              IDS_SHOW_BOOKMARK_BAR);
 }
 
 BookmarkContextMenuControllerViews::BookmarkContextMenuControllerViews(
     views::Widget* parent_widget,
     BookmarkContextMenuControllerViewsDelegate* delegate,
     Browser* browser,
     Profile* profile,
     PageNavigator* navigator,
@@ skipping 15 matching lines @@
 void BookmarkContextMenuControllerViews::BookmarkModelChanged() {
   delegate_->CloseMenu();
 }
 
 BookmarkModel* BookmarkContextMenuControllerViews::RemoveModelObserver() {
   BookmarkModel* model = model_;
   model_->RemoveObserver(this);
   model_ = NULL;
   return model;
 }