Enable and implement last 2 items in bookmark bar context menu: "Open...

chrome/browser/cocoa/bookmark_bar_controller.mm

 // Copyright (c) 2009 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 "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/cocoa/bookmark_bar_bridge.h"
 #import "chrome/browser/cocoa/bookmark_bar_constants.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h"
 #import "chrome/browser/cocoa/bookmark_bar_view.h"
 #import "chrome/browser/cocoa/bookmark_button_cell.h"
 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
 #import "chrome/browser/cocoa/bookmark_name_folder_controller.h"
 #import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h"
 #import "chrome/browser/cocoa/event_utils.h"
 #import "chrome/browser/cocoa/menu_button.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
 #import "chrome/browser/cocoa/view_resizer.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/mozilla/include/NSPasteboard+Utils.h"
@@ skipping 21 matching lines @@
 - (void)resizeButtons;
 - (void)centerNoItemsLabel;
 - (NSImage*)getFavIconForNode:(const BookmarkNode*)node;
 @end
 
 @implementation BookmarkBarController
 
 - (id)initWithBrowser:(Browser*)browser
          initialWidth:(float)initialWidth
      compressDelegate:(id<ToolbarCompressable>)compressDelegate
-       resizeDelegate:(id<ViewResizer>)resizeDelegate
-          urlDelegate:(id<BookmarkURLOpener>)urlDelegate {
+       resizeDelegate:(id<ViewResizer>)resizeDelegate {
   if ((self = [super initWithNibName:@"BookmarkBar"
                               bundle:mac_util::MainAppBundle()])) {
     browser_ = browser;
     initialWidth_ = initialWidth;
     bookmarkModel_ = browser_->profile()->GetBookmarkModel();
     buttons_.reset([[NSMutableArray alloc] init]);
     compressDelegate_ = compressDelegate;
     resizeDelegate_ = resizeDelegate;
-    urlDelegate_ = urlDelegate;
     tabObserver_.reset(
         new TabStripModelObserverBridge(browser_->tabstrip_model(), self));
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     folderImage_.reset([rb.GetNSImageNamed(IDR_BOOKMARK_BAR_FOLDER) retain]);
     defaultImage_.reset([rb.GetNSImageNamed(IDR_DEFAULT_FAVICON) retain]);
   }
   return self;
 }
 
@@ skipping 210 matching lines @@
 }
 
 - (BookmarkNode*)nodeFromButton:(id)button {
   NSCell* cell = [button cell];
   BookmarkNode* node = static_cast<BookmarkNode*>(
       [[cell representedObject] pointerValue]);
   DCHECK(node);
   return node;
 }
 
-// At this time, the only item which ever gets disabled is "Open All
-// Bookmarks".
+// At this time, the only items which ever get disabled are the "Open All
+// Bookmarks" options.
 - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
   SEL action = [item action];
-  if ((action == @selector(openAllBookmarks:)) &&
+  if (((action == @selector(openAllBookmarks:)) ||
+       (action == @selector(openAllBookmarksNewWindow:)) ||
+       (action == @selector(openAllBookmarksIncognitoWindow:))) &&
       (![buttons_ count])) {
     return NO;
   }
   return YES;
 }
 
+// Actually open the URL.  This is the last chance for a unit test to
+// override.
+- (void)openURL:(GURL)url disposition:(WindowOpenDisposition)disposition {
+  BrowserList::GetLastActive()->OpenURL(url, GURL(), disposition,
+                                        PageTransition::AUTO_BOOKMARK);
+}
+
 - (IBAction)openBookmark:(id)sender {
   BookmarkNode* node = [self nodeFromButton:sender];
-  [urlDelegate_ openBookmarkURL:node->GetURL()
-                    disposition:event_utils::WindowOpenDispositionFromNSEvent(
-                        [NSApp currentEvent])];
+  WindowOpenDisposition disposition =
+      event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
+  [self openURL:node->GetURL() disposition:disposition];
 }
 
 // Given a NSMenuItem tag, return the appropriate bookmark node id.
 - (int64)nodeIdFromMenuTag:(int32)tag {
   return menuTagMap_[tag];
 }
 
 // Create and return a new tag for the given node id.
 - (int32)menuTagFromNodeId:(int64)menuid {
   int tag = seedId_++;
@@ skipping 134 matching lines @@
   if (menu == [self offTheSideMenu])
     [self buildOffTheSideMenu];
 }
 
 // As a convention we set the menu's delegate to be the button's cell
 // so we can easily obtain bookmark info.  Convention applied in
 // -[BookmarkButtonCell menu].
 
 - (IBAction)openBookmarkInNewForegroundTab:(id)sender {
   BookmarkNode* node = [self nodeFromMenuItem:sender];
-  [urlDelegate_ openBookmarkURL:node->GetURL() disposition:NEW_FOREGROUND_TAB];
+  [self openURL:node->GetURL() disposition:NEW_FOREGROUND_TAB];
 }
 
 - (IBAction)openBookmarkInNewWindow:(id)sender {
   BookmarkNode* node = [self nodeFromMenuItem:sender];
-  [urlDelegate_ openBookmarkURL:node->GetURL() disposition:NEW_WINDOW];
+  [self openURL:node->GetURL() disposition:NEW_WINDOW];
 }
 
 - (IBAction)openBookmarkInIncognitoWindow:(id)sender {
   BookmarkNode* node = [self nodeFromMenuItem:sender];
-  [urlDelegate_ openBookmarkURL:node->GetURL() disposition:OFF_THE_RECORD];
+  [self openURL:node->GetURL() disposition:OFF_THE_RECORD];
 }
 
 - (IBAction)editBookmark:(id)sender {
   BookmarkNode* node = [self nodeFromMenuItem:sender];
 
   if (node->is_folder()) {
     BookmarkNameFolderController* controller =
         [[BookmarkNameFolderController alloc]
           initWithParentWindow:[[self view] window]
                        profile:browser_->profile()
@@ skipping 27 matching lines @@
                                                 owner:nil];
   [pasteboard setDataForURL:url title:title];
 }
 
 - (IBAction)deleteBookmark:(id)sender {
   BookmarkNode* node = [self nodeFromMenuItem:sender];
   bookmarkModel_->Remove(node->GetParent(),
                          node->GetParent()->IndexOfChild(node));
 }
 
-- (void)openBookmarkNodesRecursive:(BookmarkNode*)node {
+// An ObjC version of bookmark_utils::OpenAllImpl().
+- (void)openBookmarkNodesRecursive:(BookmarkNode*)node
+                       disposition:(WindowOpenDisposition)disposition {
   for (int i = 0; i < node->GetChildCount(); i++) {
     BookmarkNode* child = node->GetChild(i);
-    if (child->is_url())
-      [urlDelegate_ openBookmarkURL:child->GetURL()
-                     disposition:NEW_BACKGROUND_TAB];
-    else
-      [self openBookmarkNodesRecursive:child];
+    if (child->is_url()) {
+      [self openURL:child->GetURL() disposition:disposition];
+      // We revert to a basic disposition in case the initial
+      // disposition opened a new window.
+      disposition = NEW_BACKGROUND_TAB;
+    } else {
+      [self openBookmarkNodesRecursive:child disposition:disposition];
+    }
   }
 }
 
 - (IBAction)openAllBookmarks:(id)sender {
   // TODO(jrg):
   // Is there an easier way to get a non-const root node for the bookmark bar?
   // I can't iterate over them unless it's non-const.
+  BookmarkNode* node = const_cast<BookmarkNode*>(
+    bookmarkModel_->GetBookmarkBarNode());
+  [self openBookmarkNodesRecursive:node disposition:NEW_FOREGROUND_TAB];
+  UserMetrics::RecordAction(L"OpenAllBookmarks", browser_->profile());
+}
 
-  BookmarkNode* node = (BookmarkNode*)bookmarkModel_->GetBookmarkBarNode();
-  [self openBookmarkNodesRecursive:node];
+- (IBAction)openAllBookmarksNewWindow:(id)sender {
+  BookmarkNode* node = const_cast<BookmarkNode*>(
+    bookmarkModel_->GetBookmarkBarNode());
+  [self openBookmarkNodesRecursive:node disposition:NEW_WINDOW];
+  UserMetrics::RecordAction(L"OpenAllBookmarksNewWindow", browser_->profile());
+}
+
+- (IBAction)openAllBookmarksIncognitoWindow:(id)sender {
+  BookmarkNode* node = const_cast<BookmarkNode*>(
+    bookmarkModel_->GetBookmarkBarNode());
+  [self openBookmarkNodesRecursive:node disposition:OFF_THE_RECORD];
+  UserMetrics::RecordAction(L"OpenAllBookmarksIncognitoWindow", browser_->profile());
 }
 
 // May be called from the bar or from a folder button.
 // If called from a button, that button becomes the parent.
 - (IBAction)addPage:(id)sender {
   const BookmarkNode* parent = [self nodeFromMenuItem:sender];
   if (!parent)
     parent = bookmarkModel_->GetBookmarkBarNode();
   BookmarkEditor::Show([[self view] window],
                        browser_->profile(),
@@ skipping 29 matching lines @@
 // TODO(jrg): move much of the cell config into the BookmarkButtonCell class.
 - (NSCell*)cellForBookmarkNode:(const BookmarkNode*)node {
   NSString* title = base::SysWideToNSString(node->GetTitle());
   BookmarkButtonCell* cell =
       [[[BookmarkButtonCell alloc] initTextCell:nil] autorelease];
   DCHECK(cell);
   [cell setRepresentedObject:[NSValue valueWithPointer:node]];
 
   NSImage* image = [self getFavIconForNode:node];
   [cell setBookmarkCellText:title image:image];
-  [cell setMenu:buttonContextMenu_];
+  if (node->is_folder())
+    [cell setMenu:[[self view] menu]];
+  else
+    [cell setMenu:buttonContextMenu_];
   return cell;
 }
 
 // Return an appropriate width for the given bookmark button cell.
 // The "+2" is needed because, sometimes, Cocoa is off by a tad.
 // Example: for a bookmark named "Moma" or "SFGate", it is one pixel
 // too small.  For "FBL" it is 2 pixels too small.
 // For a bookmark named "SFGateFooWoo", it is just fine.
 - (CGFloat)widthForBookmarkButtonCell:(NSCell*)cell {
   CGFloat desired = [cell cellSize].width + 2;
@@ skipping 49 matching lines @@
   // We may have just crossed a threshold to enable the off-the-side
   // button.
   [self showOrHideOffTheSideButton];
 }
 
 - (IBAction)openBookmarkMenuItem:(id)sender {
   int64 tag = [self nodeIdFromMenuTag:[sender tag]];
   const BookmarkNode* node = bookmarkModel_->GetNodeByID(tag);
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
-  [urlDelegate_ openBookmarkURL:node->GetURL() disposition:disposition];
+  [self openURL:node->GetURL() disposition:disposition];
 }
 
 // Create buttons for all items in the bookmark node tree.
 //
 // TODO(jrg): write a "build bar" so there is a nice spot for things
 // like the contextual menu which is invoked when not over a
 // bookmark.  On Safari that menu has a "new folder" option.
 - (void)addNodesToButtonList:(const BookmarkNode*)node {
   BOOL hidden = (node->GetChildCount() == 0) ? NO : YES;
   NSView* item = [buttonView_ noItemTextfield];
@@ skipping 189 matching lines @@
     }
   }
 }
 
 // TODO(jrg): for now this is brute force.
 - (void)nodeChildrenReordered:(BookmarkModel*)model
                          node:(const BookmarkNode*)node {
   [self loaded:model];
 }
 
-- (void)setUrlDelegate:(id<BookmarkURLOpener>)urlDelegate {
-  urlDelegate_ = urlDelegate;
-}
-
 - (NSArray*)buttons {
   return buttons_.get();
 }
 
 - (NSButton*)offTheSideButton {
   return offTheSideButton_;
 }
 
 - (NSButton*)otherBookmarksButton {
   return otherBookmarksButton_.get();
 }
 
 - (NSImage*)getFavIconForNode:(const BookmarkNode*)node {
   if (node->is_folder())
     return folderImage_;
 
   const SkBitmap& favIcon = bookmarkModel_->GetFavIcon(node);
   if (!favIcon.isNull())
     return gfx::SkBitmapToNSImage(favIcon);
 
   return defaultImage_;
 }
 
 @end