From 40fbc87a25f09e24421dd39cd661d7a2f2e64650 Mon Sep 17 00:00:00 2001 From: "viettrungluu@chromium.org" Date: Sat, 7 Nov 2009 05:52:21 +0000 Subject: Mac: remove spurious toolbar context menu and associated crash. The toolbar should not have a context menu, and it should decidedly not be hooked up to the Page menu. Changes to Toolbar.xib: - remove the connection from the Toolbar |menu| outlet (to the Page Menu) - connect Chrome UI Localizer's |yetAnotherObjectToLocalize_| outlet to the Page Menu BUG=26823 TEST=See bug. Also, make sure the toolbar does NOT have a context menu, and that the Page Menu is displayed correctly. Review URL: http://codereview.chromium.org/371049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31370 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/nibs/Toolbar.xib | 790 +++----------------------------------------- 1 file changed, 53 insertions(+), 737 deletions(-) (limited to 'chrome/app/nibs') diff --git a/chrome/app/nibs/Toolbar.xib b/chrome/app/nibs/Toolbar.xib index 5489a9b..4548853 100644 --- a/chrome/app/nibs/Toolbar.xib +++ b/chrome/app/nibs/Toolbar.xib @@ -1,17 +1,14 @@ - + 1050 - 10B504 - 740 - 1038.2 - 437.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 740 - + 9L31a + 677 + 949.54 + 353.00 YES + YES @@ -19,7 +16,7 @@ YES - + YES @@ -55,7 +52,7 @@ chromium.org LucidaGrande - 13 + 1.300000e+01 16 @@ -93,7 +90,7 @@ LucidaGrande - 13 + 1.300000e+01 1044 @@ -121,8 +118,8 @@ 134250496 - -1 + -2030812929 6 @@ -176,8 +173,8 @@ 134250496 - 1 + -2031861505 6 @@ -202,8 +199,8 @@ 134250496 - -2 + -2030812929 6 @@ -228,8 +225,8 @@ 134250496 - 1 + -2031861505 6 @@ -498,15 +495,6 @@ 2147483647 - 40003 - - - - ^IDS_DEV_TOOLS_CONSOLE - - 2147483647 - - 40004 @@ -654,28 +642,6 @@ - - - YES - YES - ^IDS_SYNC_START_SYNC_BUTTON_LABEL - - 2147483647 - - - 41108 - - - - YES - YES - YES - - - 2147483647 - - - ^IDS_PREFERENCES_MAC @@ -809,14 +775,6 @@ 41 - - menu - - - - 46 - - commandDispatch: @@ -1065,20 +1023,12 @@ 139 - - commandDispatch: - - - - 142 - - - - commandDispatch: - - + + yetAnotherObjectToLocalize_ + + - 144 + 140 @@ -1086,26 +1036,28 @@ YES 0 - + + YES + -2 - - File's Owner + + RmlsZSdzIE93bmVyA -1 - + First Responder -3 - + Application @@ -1123,7 +1075,7 @@ - + 2 @@ -1274,7 +1226,7 @@ - + 43 @@ -1309,10 +1261,8 @@ - - - + 49 @@ -1411,7 +1361,6 @@ - @@ -1515,7 +1464,7 @@ 122 - + 127 @@ -1530,28 +1479,13 @@ 130 - - - - 140 - - - - - 141 - - - - - 143 - - + YES - + YES -1.IBPluginDependency -2.IBPluginDependency @@ -1575,9 +1509,6 @@ 13.IBPluginDependency 14.CustomClassName 14.IBPluginDependency - 140.IBPluginDependency - 141.IBPluginDependency - 143.IBPluginDependency 15.CustomClassName 15.IBPluginDependency 2.CustomClassName @@ -1673,9 +1604,6 @@ com.apple.InterfaceBuilder.CocoaPlugin ToolbarButtonCell com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin ClickHoldButtonCell com.apple.InterfaceBuilder.CocoaPlugin DelayedMenuButton @@ -1699,7 +1627,9 @@ com.apple.InterfaceBuilder.CocoaPlugin YES - + + YES + YES @@ -1733,12 +1663,12 @@ com.apple.InterfaceBuilder.CocoaPlugin AutocompleteTextField com.apple.InterfaceBuilder.CocoaPlugin - {{452, 397}, {232, 293}} + {{466, 432}, {235, 293}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{362, 493}, {332, 263}} + {{362, 523}, {306, 233}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1757,7 +1687,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{684, 367}, {241, 83}} + {{1211, 422}, {201, 63}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1798,7 +1728,9 @@ YES - + + YES + YES @@ -1806,13 +1738,15 @@ YES - + + YES + YES - 144 + 140 @@ -1822,7 +1756,7 @@ NSObject YES - + YES orderFrontStandardAboutPanel: showPreferences: @@ -1835,7 +1769,7 @@ YES - + YES closeTabMenuItem_ closeWindowMenuItem_ @@ -1908,7 +1842,7 @@ NSObject YES - + YES commandDispatch: commandDispatchUsingKeyModifiers: @@ -1929,7 +1863,7 @@ NSObject YES - + YES otherObjectToLocalize_ owner_ @@ -2000,7 +1934,7 @@ NSWindowController YES - + YES addHomepage: browseDownloadLocation: @@ -2037,7 +1971,7 @@ YES - + YES basicsGroupDefaultBrowser_ basicsGroupHomePage_ @@ -2108,7 +2042,7 @@ NSViewController YES - + YES closeTab: commandDispatch: @@ -2121,7 +2055,7 @@ YES - + YES closeButton_ contextMenu_ @@ -2164,7 +2098,7 @@ NSViewController YES - + YES backButton_ encodingMenu_ @@ -2215,626 +2149,8 @@ - - 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 - - - - NSArray - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArray.h - - - - NSArray - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSArray - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSArray - - IBFrameworkSource - Foundation.framework/Headers/NSPathUtilities.h - - - - NSArray - - IBFrameworkSource - Foundation.framework/Headers/NSPredicate.h - - - - NSArray - - IBFrameworkSource - Foundation.framework/Headers/NSSortDescriptor.h - - - - NSArrayController - NSObjectController - - IBFrameworkSource - AppKit.framework/Headers/NSArrayController.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 - - - - NSController - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSController.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 - - - - NSMovieView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMovieView.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 - - - - NSObject - - - - 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 - - - - NSObjectController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSObjectController.h - - - - NSPathControl - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSPathControl.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSScrollView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSScrollView.h - - - - NSText - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSText.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSToolbar - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbar.h - - - - NSUserDefaultsController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSUserDefaultsController.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 - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - NSWindowController - NSResponder - - showWindow: - id - - - IBFrameworkSource - AppKit.framework/Headers/NSWindowController.h - - - 0 - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES ../../chrome.xcodeproj 3 -- cgit v1.1