From 730aef2589a2e544797931eab99ea3d770040d99 Mon Sep 17 00:00:00 2001 From: "jrg@chromium.org" Date: Thu, 12 Nov 2009 01:09:25 +0000 Subject: Enable and implement last 2 items in bookmark bar context menu: "Open All In New Window" and "Open All In Incognito Window" (17616). Bookmark Folders have the bar context menu, not the bookmark context menu (26748). Disable bookmark manager item on bookmark contextual menus (26944). BUG=http://crbug.com/17616, http://crbug.com/26748, http://crbug.com/26944 TEST=Add some bookmarks. Make sure "Open All In New Window" and "Open All In Incognito Window" work from the bar context menu. Add a bookmark folder. Make sure the context menu of the folder is the bar conetxt menu, not the 'mark context menu. Make sure Bookmark Manager item is DISabled in both context menus. nib change: hook up actions in the "Open All Blah" items just like the normal "Open All". Review URL: http://codereview.chromium.org/373022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31748 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/nibs/BookmarkBar.xib | 594 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 539 insertions(+), 55 deletions(-) (limited to 'chrome/app/nibs') diff --git a/chrome/app/nibs/BookmarkBar.xib b/chrome/app/nibs/BookmarkBar.xib index 3f2075c..127d24f 100644 --- a/chrome/app/nibs/BookmarkBar.xib +++ b/chrome/app/nibs/BookmarkBar.xib @@ -1,21 +1,34 @@ - + 1050 - 9L30 - 670 - 949.54 - 353.00 + 10B504 + 732 + 1038.2 + 437.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 732 + YES - - + + YES com.apple.InterfaceBuilder.CocoaPlugin + + YES + + YES + + + YES + + YES @@ -49,7 +62,7 @@ ^IDS_BOOKMARKS_NO_ITEMS LucidaGrande - 1.100000e+01 + 11 3100 @@ -59,7 +72,7 @@ controlColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -373,22 +386,6 @@ commandDispatch: - - - 33 - - - - commandDispatch: - - - - 34 - - - - commandDispatch: - 35 @@ -633,34 +630,48 @@ 98 + + + openAllBookmarksNewWindow: + + + + 99 + + + + openAllBookmarksIncognitoWindow: + + + + 100 + YES 0 - - YES - + -2 - - RmlsZSdzIE93bmVyA + + File's Owner -1 - + First Responder -3 - + Application @@ -671,7 +682,7 @@ - + 4 @@ -691,7 +702,7 @@ - + Bar Menu @@ -773,7 +784,7 @@ - + Button Menu @@ -862,7 +873,7 @@ 72 - + 75 @@ -871,7 +882,7 @@ YES - + Off-the-side Menu @@ -902,7 +913,7 @@ YES - + YES -1.IBPluginDependency -2.IBPluginDependency @@ -964,7 +975,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{364, 332}, {365, 233}} + {{364, 332}, {362, 233}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -978,7 +989,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{40, 636}, {375, 213}} + {{40, 636}, {372, 213}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1001,9 +1012,7 @@ YES - - YES - + YES @@ -1011,15 +1020,13 @@ YES - - YES - + YES - 98 + 100 @@ -1037,7 +1044,7 @@ NSViewController YES - + YES addFolder: addPage: @@ -1045,6 +1052,8 @@ deleteBookmark: editBookmark: openAllBookmarks: + openAllBookmarksIncognitoWindow: + openAllBookmarksNewWindow: openBookmark: openBookmarkInIncognitoWindow: openBookmarkInNewForegroundTab: @@ -1064,18 +1073,19 @@ id id id + id + id YES - + YES buttonContextMenu_ buttonView_ compressDelegate_ offTheSideButton_ resizeDelegate_ - urlDelegate_ YES @@ -1084,7 +1094,6 @@ id MenuButton id - id @@ -1109,7 +1118,7 @@ NSView YES - + YES controller_ noItemTextfield_ @@ -1158,7 +1167,7 @@ NSObject YES - + YES otherObjectToLocalize_ owner_ @@ -1222,7 +1231,7 @@ NSViewController YES - + YES closeTab: commandDispatch: @@ -1235,7 +1244,7 @@ YES - + YES closeButton_ contextMenu_ @@ -1258,8 +1267,483 @@ + + YES + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSHelpManager.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSPageLayout.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSMenuItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CIImageProvider.h + + + + NSObject + + IBFrameworkSource + SecurityInterface.framework/Headers/SFAuthorizationView.h + + + + NSObject + + IBFrameworkSource + SecurityInterface.framework/Headers/SFCertificatePanel.h + + + + NSObject + + IBFrameworkSource + SecurityInterface.framework/Headers/SFChooseIdentityPanel.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSViewController + NSResponder + + view + NSView + + + IBFrameworkSource + AppKit.framework/Headers/NSViewController.h + + + 0 + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES ../../chrome.xcodeproj 3 -- cgit v1.1