From a24b7aff2b62be4ebadedd9cf0898f73ac004e2d Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Fri, 6 Nov 2009 23:07:14 +0000 Subject: Add View:Developer:JavaScript Console, bind to command-shift-C This is the Mac equivalent of r31225, http://codereview.chromium.org/377005 BUG=none TEST=Command-shift-C and View:Developer:JavaScript Console should bring up the Developer Tools in console mode. Command-option-J and View:Developer:Developer Tools should show the Developer Tools window not in console mode. The menu items should be visible in View:Developer and in the Page menu under Developer. Review URL: http://codereview.chromium.org/377017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31317 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/generated_resources.grd | 3 + chrome/app/nibs/MainMenu.xib | 54 ++- chrome/app/nibs/Toolbar.xib | 755 ++++++++++++++++++++++++++++++++++--- 3 files changed, 743 insertions(+), 69 deletions(-) (limited to 'chrome/app') diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 87efd5b..63854b0 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5804,6 +5804,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Developer Tools + + JavaScript Console + Task Manager diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib index 8bc4689..5ead1e2 100644 --- a/chrome/app/nibs/MainMenu.xib +++ b/chrome/app/nibs/MainMenu.xib @@ -3,16 +3,16 @@ 1050 10B504 - 732 + 740 1038.2 437.00 com.apple.InterfaceBuilder.CocoaPlugin - 732 + 740 YES - + YES @@ -750,6 +750,16 @@ 2147483647 + 40003 + + + + ^IDS_DEV_TOOLS_CONSOLE_MAC + C + 1048576 + 2147483647 + + 40004 @@ -1566,6 +1576,14 @@ 655 + + + commandDispatch: + + + + 657 + @@ -2174,6 +2192,7 @@ + @@ -2359,6 +2378,11 @@ + + 656 + + + @@ -2538,6 +2562,7 @@ 648.IBPluginDependency 648.ImportedFromIB2 652.IBPluginDependency + 656.IBPluginDependency 72.IBPluginDependency 72.ImportedFromIB2 73.IBPluginDependency @@ -2616,7 +2641,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{640, -48}, {344, 223}} + {{445, 186}, {344, 223}} com.apple.InterfaceBuilder.CocoaPlugin {{197, 734}, {243, 243}} @@ -2660,13 +2685,13 @@ com.apple.InterfaceBuilder.CocoaPlugin {{525, 802}, {197, 73}} - {{149, 387}, {1578, 20}} + {{30, 409}, {1578, 20}} com.apple.InterfaceBuilder.CocoaPlugin {74, 862} {{11, 977}, {478, 20}} com.apple.InterfaceBuilder.CocoaPlugin - {{736, 174}, {380, 213}} + {{617, 196}, {380, 213}} com.apple.InterfaceBuilder.CocoaPlugin {{475, 832}, {234, 43}} com.apple.InterfaceBuilder.CocoaPlugin @@ -2699,7 +2724,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{973, 84}, {279, 63}} + {{997, 136}, {317, 83}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2723,7 +2748,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{80, 101}, {385, 213}} + {{42, 196}, {382, 213}} com.apple.InterfaceBuilder.CocoaPlugin {{23, 794}, {245, 183}} @@ -2739,6 +2764,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2780,7 +2806,7 @@ - 655 + 657 @@ -2828,14 +2854,6 @@ - CrApplication - NSApplication - - IBProjectSource - browser/chrome_application_mac.h - - - DownloadShelfController NSViewController @@ -3575,7 +3593,7 @@ com.apple.InterfaceBuilder.CocoaPlugin.macosx - + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 diff --git a/chrome/app/nibs/Toolbar.xib b/chrome/app/nibs/Toolbar.xib index 06b94b1..5489a9b 100644 --- a/chrome/app/nibs/Toolbar.xib +++ b/chrome/app/nibs/Toolbar.xib @@ -1,15 +1,17 @@ - + 1050 - 9L31a - 677 - 949.54 - 353.00 + 10B504 + 740 + 1038.2 + 437.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 740 + YES - - YES @@ -17,7 +19,7 @@ YES - + YES @@ -53,7 +55,7 @@ chromium.org LucidaGrande - 1.300000e+01 + 13 16 @@ -91,7 +93,7 @@ LucidaGrande - 1.300000e+01 + 13 1044 @@ -119,8 +121,8 @@ 134250496 - -1 + -1 -2030812929 6 @@ -174,8 +176,8 @@ 134250496 - 1 + 1 -2031861505 6 @@ -200,8 +202,8 @@ 134250496 - -2 + -2 -2030812929 6 @@ -226,8 +228,8 @@ 134250496 - 1 + 1 -2031861505 6 @@ -496,6 +498,15 @@ 2147483647 + 40003 + + + + ^IDS_DEV_TOOLS_CONSOLE + + 2147483647 + + 40004 @@ -1061,34 +1072,40 @@ 142 + + + commandDispatch: + + + + 144 + YES 0 - - YES - + -2 - - RmlsZSdzIE93bmVyA + + File's Owner -1 - + First Responder -3 - + Application @@ -1106,7 +1123,7 @@ - + 2 @@ -1257,7 +1274,7 @@ - + 43 @@ -1295,7 +1312,7 @@ - + 49 @@ -1394,6 +1411,7 @@ + @@ -1497,7 +1515,7 @@ 122 - + 127 @@ -1512,7 +1530,7 @@ 130 - + 140 @@ -1524,11 +1542,16 @@ + + 143 + + + YES - + YES -1.IBPluginDependency -2.IBPluginDependency @@ -1554,6 +1577,7 @@ 14.IBPluginDependency 140.IBPluginDependency 141.IBPluginDependency + 143.IBPluginDependency 15.CustomClassName 15.IBPluginDependency 2.CustomClassName @@ -1651,6 +1675,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin ClickHoldButtonCell com.apple.InterfaceBuilder.CocoaPlugin DelayedMenuButton @@ -1674,9 +1699,7 @@ com.apple.InterfaceBuilder.CocoaPlugin YES - - YES - + YES @@ -1710,12 +1733,12 @@ com.apple.InterfaceBuilder.CocoaPlugin AutocompleteTextField com.apple.InterfaceBuilder.CocoaPlugin - {{1454, 785}, {235, 293}} + {{452, 397}, {232, 293}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{362, 493}, {335, 263}} + {{362, 493}, {332, 263}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1734,7 +1757,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{1211, 422}, {201, 63}} + {{684, 367}, {241, 83}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1775,9 +1798,7 @@ YES - - YES - + YES @@ -1785,15 +1806,13 @@ YES - - YES - + YES - 142 + 144 @@ -1803,7 +1822,7 @@ NSObject YES - + YES orderFrontStandardAboutPanel: showPreferences: @@ -1816,7 +1835,7 @@ YES - + YES closeTabMenuItem_ closeWindowMenuItem_ @@ -1834,7 +1853,7 @@ AutocompleteTextField - NSTextField + StyledTextField IBProjectSource browser/cocoa/autocomplete_text_field.h @@ -1842,7 +1861,7 @@ AutocompleteTextFieldCell - NSTextFieldCell + StyledTextFieldCell IBProjectSource browser/cocoa/autocomplete_text_field_cell.h @@ -1889,7 +1908,7 @@ NSObject YES - + YES commandDispatch: commandDispatchUsingKeyModifiers: @@ -1910,7 +1929,7 @@ NSObject YES - + YES otherObjectToLocalize_ owner_ @@ -1981,7 +2000,7 @@ NSWindowController YES - + YES addHomepage: browseDownloadLocation: @@ -2018,7 +2037,7 @@ YES - + YES basicsGroupDefaultBrowser_ basicsGroupHomePage_ @@ -2069,11 +2088,27 @@ + StyledTextField + NSTextField + + IBProjectSource + browser/cocoa/styled_text_field.h + + + + StyledTextFieldCell + NSTextFieldCell + + IBProjectSource + browser/cocoa/styled_text_field_cell.h + + + TabController NSViewController YES - + YES closeTab: commandDispatch: @@ -2086,7 +2121,7 @@ YES - + YES closeButton_ contextMenu_ @@ -2129,7 +2164,7 @@ NSViewController YES - + YES backButton_ encodingMenu_ @@ -2180,8 +2215,626 @@ + + 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