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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 196 matching lines @@
 // Determine the nature of the bookmark bar contents based on the number of
 // buttons showing. If too many then show the off-the-side list, if none
 // then show the no items label.
 - (void)reconfigureBookmarkBar;
 
 - (void)addNode:(const BookmarkNode*)child toMenu:(NSMenu*)menu;
 - (void)addFolderNode:(const BookmarkNode*)node toMenu:(NSMenu*)menu;
 - (void)tagEmptyMenu:(NSMenu*)menu;
 - (void)clearMenuTagMap;
 - (int)preferredHeight;
-- (void)addNonBookmarkButtonsToView;
 - (void)addButtonsToView;
 - (void)centerNoItemsLabel;
 - (void)setNodeForBarMenu;
 - (void)watchForExitEvent:(BOOL)watch;
 - (void)resetAllButtonPositionsWithAnimation:(BOOL)animate;
 
 @end
 
 @implementation BookmarkBarController
 
@@ skipping 49 matching lines @@
   return self;
 }
 
 - (void)pulseBookmarkNotification:(NSNotification*)notification {
   NSDictionary* dict = [notification userInfo];
   const BookmarkNode* node = NULL;
   NSValue *value = [dict objectForKey:bookmark_button::kBookmarkKey];
   DCHECK(value);
   if (value)
     node = static_cast<const BookmarkNode*>([value pointerValue]);
-  NSNumber* number = [dict
-                       objectForKey:bookmark_button::kBookmarkPulseFlagKey];
+  NSNumber* number = [dict objectForKey:bookmark_button::kBookmarkPulseFlagKey];
   DCHECK(number);
   BOOL doPulse = number ? [number boolValue] : NO;
 
-  // 3 cases:
+  // 4 cases:
   // button on the bar: flash it
   // button in "other bookmarks" folder: flash other bookmarks
+  // button is "apps page" shortcut: flash it
   // button in "off the side" folder: flash the chevron
   for (BookmarkButton* button in [self buttons]) {
     if ([button bookmarkNode] == node) {
       [button setIsContinuousPulsing:doPulse];
       return;
     }
   }
   if ([otherBookmarksButton_ bookmarkNode] == node) {
     [otherBookmarksButton_ setIsContinuousPulsing:doPulse];
     return;
   }
+  if ([appsPageShortcutButton_ bookmarkNode] == node) {
+    [appsPageShortcutButton_ setIsContinuousPulsing:doPulse];
+    return;
+  }
   if (node->parent() == bookmarkModel_->bookmark_bar_node()) {
     [offTheSideButton_ setIsContinuousPulsing:doPulse];
     return;
   }
 
   NOTREACHED() << "no bookmark button found to pulse!";
 }
 
 - (void)dealloc {
   // Clear delegate so it doesn't get called during stopAnimation.
@@ skipping 561 matching lines @@
   DCHECK([[self view] isKindOfClass:[AnimatableView class]]);
   return (AnimatableView*)[self view];
 }
 
 - (bookmark_utils::BookmarkLaunchLocation)bookmarkLaunchLocation {
   return currentState_ == BookmarkBar::DETACHED ?
       bookmark_utils::LAUNCH_DETACHED_BAR :
       bookmark_utils::LAUNCH_ATTACHED_BAR;
 }
 
-// Position the off-the-side chevron to the left of the otherBookmarks button,
-// unless it's hidden in which case it's right aligned on top of it.
-- (void)positionOffTheSideButton {
+// Position the right-side button including the off-the-side chevron.
+- (void)positionSideButtons {
+  int right = NSMaxX([[self buttonView] bounds]) -
+      bookmarks::kBookmarkHorizontalPadding;
+  if (![appsPageShortcutButton_ isHidden]) {
+    int ignored = 0;
+    NSRect frame = [self frameForBookmarkButtonFromCell:
+        [appsPageShortcutButton_ cell] xOffset:&ignored];
+    right -= frame.size.width;
+    frame.origin.x = right;
+    [appsPageShortcutButton_ setFrame:frame];
+  }
+  if (![otherBookmarksButton_ isHidden]) {
+    int ignored = 0;
+    NSRect frame = [self frameForBookmarkButtonFromCell:
+        [otherBookmarksButton_ cell] xOffset:&ignored];
+    right -= frame.size.width;
+    frame.origin.x = right;
+    [otherBookmarksButton_ setFrame:frame];
+  }
+
   NSRect frame = [offTheSideButton_ frame];
   frame.size.height = bookmarks::kBookmarkFolderButtonHeight;
-  if (otherBookmarksButton_.get() && ![otherBookmarksButton_ isHidden]) {
-    frame.origin.x = ([otherBookmarksButton_ frame].origin.x -
-                      (frame.size.width +
-                       bookmarks::kBookmarkHorizontalPadding));
-  } else {
-    frame.origin.x = (NSMaxX([otherBookmarksButton_ frame]) - frame.size.width);
-  }
+  right -= frame.size.width;
+  frame.origin.x = right;
   [offTheSideButton_ setFrame:frame];
 }
 
 // Configure the off-the-side button (e.g. specify the node range,
 // check if we should enable or disable it, etc).
 - (void)configureOffTheSideButtonContentsAndVisibility {
   // If deleting a button while off-the-side is open, buttons may be
   // promoted from off-the-side to the bar.  Accomodate.
   if (folderController_ &&
       ([folderController_ parentButton] == offTheSideButton_)) {
     [folderController_ reconfigureMenu];
   }
 
   [[offTheSideButton_ cell] setStartingChildIndex:displayedButtonCount_];
   [[offTheSideButton_ cell]
-   setBookmarkNode:bookmarkModel_->bookmark_bar_node()];
+    setBookmarkNode:bookmarkModel_->bookmark_bar_node()];

[Alexei Svitkine (slow), 2013/03/07 15:56:59]

Nit: Remove this from the diff.

[beaudoin, 2013/03/07 21:03:54]

Done.

   int bookmarkChildren = bookmarkModel_->bookmark_bar_node()->child_count();
   if (bookmarkChildren > displayedButtonCount_) {
     [offTheSideButton_ setHidden:NO];
   } else {
     // If we just deleted the last item in an off-the-side menu so the
     // button will be going away, make sure the menu goes away.
     if (folderController_ &&
         ([folderController_ parentButton] == offTheSideButton_))
       [self closeAllBookmarkFolders];
     // (And hide the button, too.)
@@ skipping 414 matching lines @@
   } else {
     // Make the button do something
     [button setTarget:self];
     [button setAction:@selector(openBookmark:)];
     if (node->is_url())
       [button setToolTip:[BookmarkMenuCocoaController tooltipForNode:node]];
   }
   return [[button.get() retain] autorelease];
 }
 
-// Add non-bookmark buttons to the view.  This includes the chevron
-// and the "other bookmarks" button.  Technically "other bookmarks" is
-// a bookmark button but it is treated specially.  Only needs to be
-// called when these buttons are new or when the bookmark bar is
-// cleared (e.g. on a loaded: call).  Unlike addButtonsToView below,
-// we don't need to add/remove these dynamically in response to window
-// resize.
-- (void)addNonBookmarkButtonsToView {
-  [buttonView_ addSubview:otherBookmarksButton_.get()];
-  [buttonView_ addSubview:offTheSideButton_];
-}
-
 // Add bookmark buttons to the view only if they are completely
 // visible and don't overlap the "other bookmarks".  Remove buttons
 // which are clipped.  Called when building the bookmark bar the first time.
 - (void)addButtonsToView {
   displayedButtonCount_ = 0;
   NSMutableArray* buttons = [self buttons];
   for (NSButton* button in buttons) {
     if (NSMaxX([button frame]) > (NSMinX([offTheSideButton_ frame]) -
                                   bookmarks::kBookmarkHorizontalPadding))
       break;
@@ skipping 12 matching lines @@
 // whether it ended up visible.
 - (BOOL)setOtherBookmarksButtonVisibility {
   if (!otherBookmarksButton_.get())
     return NO;
 
   BOOL visible = ![otherBookmarksButton_ bookmarkNode]->empty();
   [otherBookmarksButton_ setHidden:!visible];
   return visible;
 }
 
-// Create the button for "Other Bookmarks" on the right of the bar.
+// Shows or hides the Apps button as appropriate, and returns whether it ended
+// up visible.
+- (BOOL)setAppsPageShortcutButtonVisibility {
+  if (!appsPageShortcutButton_.get())
+    return NO;
+
+  // TODO(beaudoin): Take into account the preference state.
+  BOOL visible = chrome::search::IsInstantExtendedAPIEnabled();
+  [appsPageShortcutButton_ setHidden:!visible];
+  return visible;
+}
+
+- (BookmarkButton*)createCustomBookmarksButton:(const BookmarkNode*)node {

[Alexei Svitkine (slow), 2013/03/07 15:56:59]

Nit: Add a comment.

[beaudoin, 2013/03/07 21:03:54]

Done.

+  NSCell* cell = [self cellForBookmarkNode:node];
+  BookmarkButton* button = [[BookmarkButton alloc] init];
+  [[button draggableButton] setDraggable:NO];
+  [[button draggableButton] setActsOnMouseDown:YES];
+  // Peg at right; keep same height as bar.
+  [button setAutoresizingMask:(NSViewMinXMargin)];
+  [button setCell:cell];
+  [button setDelegate:self];
+  [button setTarget:self];
+  // Make sure this button, like all other BookmarkButtons, lives
+  // until the end of the current event loop.
+  [[button retain] autorelease];
+  return button;
+}
+
+// Create the button for "Other Bookmarks", but does not position it.
 - (void)createOtherBookmarksButton {
   // Can't create this until the model is loaded, but only need to
   // create it once.
   if (otherBookmarksButton_.get()) {
     [self setOtherBookmarksButtonVisibility];
     return;
   }
 
-  // TODO(jrg): remove duplicate code
-  NSCell* cell = [self cellForBookmarkNode:bookmarkModel_->other_node()];
-  int ignored = 0;
-  NSRect frame = [self frameForBookmarkButtonFromCell:cell xOffset:&ignored];
-  frame.origin.x = [[self buttonView] bounds].size.width - frame.size.width;
-  frame.origin.x -= bookmarks::kBookmarkHorizontalPadding;
-  BookmarkButton* button = [[BookmarkButton alloc] initWithFrame:frame];
-  [[button draggableButton] setDraggable:NO];
-  [[button draggableButton] setActsOnMouseDown:YES];
-  otherBookmarksButton_.reset(button);
-  view_id_util::SetID(button, VIEW_ID_OTHER_BOOKMARKS);
-
-  // Make sure this button, like all other BookmarkButtons, lives
-  // until the end of the current event loop.
-  [[button retain] autorelease];
-
-  // Peg at right; keep same height as bar.
-  [button setAutoresizingMask:(NSViewMinXMargin)];
-  [button setCell:cell];
-  [button setDelegate:self];
-  [button setTarget:self];
-  [button setAction:@selector(openBookmarkFolderFromButton:)];
-  [buttonView_ addSubview:button];
+  otherBookmarksButton_.reset(
+      [self createCustomBookmarksButton:bookmarkModel_->other_node()]);
+  [otherBookmarksButton_ setAction:@selector(openBookmarkFolderFromButton:)];
+  view_id_util::SetID(otherBookmarksButton_.get(), VIEW_ID_OTHER_BOOKMARKS);
+  [buttonView_ addSubview:otherBookmarksButton_.get()];
 
   [self setOtherBookmarksButtonVisibility];
+}
 
-  // Now that it's here, move the chevron over.
-  [self positionOffTheSideButton];
+// Create the button for "Apps", but does not position it.
+- (void)createAppsPageShortcutButton {
+  // Can't create this until the model is loaded, but only need to
+  // create it once.
+  if (appsPageShortcutButton_.get()) {
+    [self setAppsPageShortcutButtonVisibility];
+    return;
+  }
+
+  appsPageShortcutButton_.reset(
+      [self createCustomBookmarksButton:bookmarkModel_->apps_node()]);
+  [appsPageShortcutButton_ setAction:@selector(openAppsPage:)];
+  NSString* tooltip =
+      l10n_util::GetNSString(IDS_BOOKMARK_BAR_APPS_SHORTCUT_TOOLTIP);
+  [appsPageShortcutButton_ setToolTip:tooltip];
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  [appsPageShortcutButton_ setImage:
+        rb.GetNativeImageNamed(IDR_WEBSTORE_ICON_16).ToNSImage()];
+  [buttonView_ addSubview:appsPageShortcutButton_.get()];
+
+  [self setAppsPageShortcutButtonVisibility];
+}
+
+- (IBAction)openAppsPage:(id)sender {
+  chrome::ShowAppLauncherPage(browser_);
+  bookmark_utils::RecordAppsPageOpen([self bookmarkLaunchLocation]);
 }
 
 // Now that the model is loaded, set the bookmark bar root as the node
 // represented by the bookmark bar (default, background) menu.
 - (void)setNodeForBarMenu {
   const BookmarkNode* node = bookmarkModel_->bookmark_bar_node();
   BookmarkMenu* menu = static_cast<BookmarkMenu*>([[self view] menu]);
 
   // Make sure types are compatible
   DCHECK(sizeof(long long) == sizeof(int64));
@@ skipping 97 matching lines @@
 }
 
 // Delegate method for |AnimatableView| (a superclass of
 // |BookmarkBarToolbarView|).
 - (void)animationDidEnd:(NSAnimation*)animation {
   [self finalizeState];
 }
 
 - (void)reconfigureBookmarkBar {
   [self redistributeButtonsOnBarAsNeeded];
-  [self positionOffTheSideButton];
+  [self positionSideButtons];
   [self configureOffTheSideButtonContentsAndVisibility];
   [self centerNoItemsLabel];
 }
 
 // Determine if the given |view| can completely fit within the constraint of
 // maximum x, given by |maxViewX|, and, if not, narrow the view up to a minimum
 // width. If the minimum width is not achievable then hide the view. Return YES
 // if the view was hidden.
 - (BOOL)shrinkOrHideView:(NSView*)view forMaxX:(CGFloat)maxViewX {
   BOOL wasHidden = NO;
@@ skipping 80 matching lines @@
 
 // Calculates the final position of the last button in the bar.
 // We can't just use [[self buttons] lastObject] frame] because the button
 // may be animating currently.
 - (NSRect)finalRectOfLastButton {
   return [self finalRectOfButton:[[self buttons] lastObject]];
 }
 
 - (CGFloat)buttonViewMaxXWithOffTheSideButtonIsVisible:(BOOL)visible {
   CGFloat maxViewX = NSMaxX([buttonView_ bounds]);
-  // If necessary, pull in the width to account for the Other Bookmarks button.
-  if ([self setOtherBookmarksButtonVisibility]) {
-    maxViewX = [otherBookmarksButton_.get() frame].origin.x -
+  // If necessary, pull in the width to account for the Other Bookmarks or Apps
+  // button.
+  const BOOL otherButtonVisible = [self setOtherBookmarksButtonVisibility];
+  const BOOL appsButtonVisible = [self setAppsPageShortcutButtonVisibility];
+  if (otherButtonVisible || appsButtonVisible) {
+    BookmarkButton* leftMostRightAlignedButton = otherButtonVisible ?
+        otherBookmarksButton_.get() : appsPageShortcutButton_.get();
+    maxViewX = [leftMostRightAlignedButton frame].origin.x -
                bookmarks::kBookmarkRightMargin;
   }
 
-  [self positionOffTheSideButton];
+  [self positionSideButtons];
   // If we're already overflowing, then we need to account for the chevron.
   if (visible) {
     maxViewX =
         [offTheSideButton_ frame].origin.x - bookmarks::kBookmarkRightMargin;
   }
 
   return maxViewX;
 }
 
 - (void)redistributeButtonsOnBarAsNeeded {
   const BookmarkNode* node = bookmarkModel_->bookmark_bar_node();
   NSInteger barCount = node->child_count();
 
   // Determine the current maximum extent of the visible buttons.
-  [self positionOffTheSideButton];
+  [self positionSideButtons];
   CGFloat maxViewX = [self buttonViewMaxXWithOffTheSideButtonIsVisible:
       (barCount > displayedButtonCount_)];
 
   // As a result of pasting or dragging, the bar may now have more buttons
   // than will fit so remove any which overflow.  They will be shown in
   // the off-the-side folder.
   while (displayedButtonCount_ > 0) {
     BookmarkButton* button = [buttons_ lastObject];
     if (NSMaxX([self finalRectOfLastButton]) < maxViewX)
       break;
@@ skipping 199 matching lines @@
   if (!themeProvider)
     return;
   NSColor* color =
       themeProvider->GetNSColor(ThemeProperties::COLOR_BOOKMARK_TEXT,
                                 true);
   for (BookmarkButton* button in buttons_.get()) {
     BookmarkButtonCell* cell = [button cell];
     [cell setTextColor:color];
   }
   [[otherBookmarksButton_ cell] setTextColor:color];
+  [[appsPageShortcutButton_ cell] setTextColor:color];
 }
 
 // Return YES if the event indicates an exit from the bookmark bar
 // folder menus.  E.g. "click outside" of the area we are watching.
 // At this time we are watching the area that includes all popup
 // bookmark folder windows.
 - (BOOL)isEventAnExitEvent:(NSEvent*)event {
   NSWindow* eventWindow = [event window];
   NSWindow* myWindow = [[self view] window];
   switch ([event type]) {
@@ skipping 281 matching lines @@
   // See: http://crbug.com/36614
   if (folderController_)
     [self closeAllBookmarkFolders];
 
   // Brute force nuke and build.
   savedFrameWidth_ = NSWidth([[self view] frame]);
   const BookmarkNode* node = model->bookmark_bar_node();
   [self clearBookmarkBar];
   [self addNodesToButtonList:node];
   [self createOtherBookmarksButton];
+  [self createAppsPageShortcutButton];
   [self updateTheme:[[[self view] window] themeProvider]];
-  [self positionOffTheSideButton];
-  [self addNonBookmarkButtonsToView];
+  [self positionSideButtons];
   [self addButtonsToView];
   [self configureOffTheSideButtonContentsAndVisibility];
   [self setNodeForBarMenu];
   [self reconfigureBookmarkBar];
 }
 
 - (void)beingDeleted:(BookmarkModel*)model {
   // The browser may be being torn down; little is safe to do.  As an
   // example, it may not be safe to clear the pasteboard.
   // http://crbug.com/38665
@@ skipping 640 matching lines @@
   return buttonContextMenu_;
 }
 
 // Intentionally ignores ownership issues; used for testing and we try
 // to minimize touching the object passed in (likely a mock).
 - (void)setButtonContextMenu:(id)menu {
   buttonContextMenu_ = menu;
 }
 
 @end