From 0cd07f946c353e33d0b9474d383ab06612e40bd8 Mon Sep 17 00:00:00 2001 From: "bauerb@chromium.org" Date: Wed, 15 Sep 2010 15:38:44 +0000 Subject: [Mac] Add per-plugin exceptions to content settings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Screenshot: http://www.dropmocks.com/mXMd I'm adding a subclass of NSArrayController, TableModelArrayController, that binds to a RemoveRowsTableModel that can use groups and displays them using group rows in an NSTableView. This cleans up SimpleContentExceptionsWindowController a lot, and the class could also be used for other table models that use groups (keyword editor and autofill). XIB changes: In SimpleContentExceptionsWindow.xib, bind table view to TableModelArrayController instead of using the dataSource outlet. Buttons call actions on TableModelArrayController, and table view delegate also points to it. BUG=39252 TEST=SimpleContentExceptionsWindowControllerTest.*:TableModelArrayControllerTest.*:PluginExceptionsTableModelTest.* Review URL: http://codereview.chromium.org/3327016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59501 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/nibs/SimpleContentExceptionsWindow.xib | 1037 +++++++++++++++++++-- 1 file changed, 939 insertions(+), 98 deletions(-) (limited to 'chrome/app/nibs/SimpleContentExceptionsWindow.xib') diff --git a/chrome/app/nibs/SimpleContentExceptionsWindow.xib b/chrome/app/nibs/SimpleContentExceptionsWindow.xib index a39b394..091d53a 100644 --- a/chrome/app/nibs/SimpleContentExceptionsWindow.xib +++ b/chrome/app/nibs/SimpleContentExceptionsWindow.xib @@ -1,14 +1,18 @@ - + 1050 - 9L31a - 680 - 949.54 - 353.00 + 10F569 + 762 + 1038.29 + 461.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 762 + YES - + YES @@ -16,7 +20,7 @@ YES - + YES @@ -42,7 +46,7 @@ ^IDS_GEOLOCATION_EXCEPTION_TITLE NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {200, 100} @@ -82,16 +86,16 @@ YES hostname - 2.750000e+02 - 4.000000e+01 - 1.000000e+03 + 275 + 40 + 1000 75628096 2048 ^IDS_EXCEPTIONS_HOSTNAME_HEADER LucidaGrande - 1.100000e+01 + 11 3100 @@ -114,7 +118,7 @@ Text Cell LucidaGrande - 1.300000e+01 + 13 1044 @@ -124,7 +128,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -136,14 +140,13 @@ 3 YES - YES action - 1.510000e+02 - 4.000000e+01 - 1.000000e+03 + 151 + 40 + 1000 75628096 2048 @@ -168,12 +171,11 @@ 3 YES - YES - 3.000000e+00 - 2.000000e+00 + 3 + 2 3 MQA @@ -187,12 +189,15 @@ MC41AA - 1.700000e+01 - 1379958784 + 17 + 1514176512 + + 1 15 0 YES + 0 {{1, 17}, {432, 287}} @@ -209,7 +214,8 @@ _doScroller: - 9.356223e-01 + 0.41114982578397202 + 0.93562230000000002 @@ -219,7 +225,7 @@ 1 _doScroller: - 9.980916e-01 + 0.99809159999999997 @@ -337,7 +343,20 @@ {{0, 0}, {1440, 878}} {200, 122} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} + + + + YES + hostname + action + + + YES + YES + YES + YES + YES ChromeUILocalizer @@ -375,22 +394,6 @@ - dataSource - - - - 26 - - - - delegate - - - - 27 - - - localizer_ @@ -407,22 +410,6 @@ - removeRow: - - - - 50 - - - - removeAll: - - - - 51 - - - closeSheet: @@ -461,34 +448,129 @@ 56 + + + delegate + + + + 62 + + + + enabled: canRemove + + + + + + enabled: canRemove + enabled + canRemove + 2 + + + 64 + + + + remove: + + + + 65 + + + + removeAll: + + + + 66 + + + + value: arrangedObjects.hostname + + + + + + value: arrangedObjects.hostname + value + arrangedObjects.hostname + + YES + + YES + NSConditionallySetsEditable + NSCreatesSortDescriptor + + + YES + + + + + 2 + + + 67 + + + + value: arrangedObjects.action + + + + + + value: arrangedObjects.action + value + arrangedObjects.action + + NSCreatesSortDescriptor + + + 2 + + + 68 + + + + arrayController_ + + + + 69 + YES 0 - - YES - + -2 - - RmlsZSdzIE93bmVyA + + File's Owner -1 - + First Responder -3 - + Application @@ -498,7 +580,7 @@ YES - + 2 @@ -574,7 +656,7 @@ 20 - + 38 @@ -645,13 +727,19 @@ 44 - + + + + 57 + + + Content Settings YES - + YES -1.IBPluginDependency -2.IBPluginDependency @@ -678,6 +766,8 @@ 40.IBPluginDependency 44.IBPluginDependency 5.IBPluginDependency + 57.CustomClassName + 57.IBPluginDependency 6.IBPluginDependency 7.IBPluginDependency 8.IBPluginDependency @@ -688,9 +778,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{125, 434}, {474, 384}} + {{243, 339}, {474, 384}} com.apple.InterfaceBuilder.CocoaPlugin - {{125, 434}, {474, 384}} + {{243, 339}, {474, 384}} {196, 240} {{357, 418}, {480, 270}} @@ -710,6 +800,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + TableModelArrayController + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -718,9 +810,7 @@ YES - - YES - + YES @@ -728,15 +818,13 @@ YES - - YES - + YES - 56 + 69 @@ -754,7 +842,7 @@ NSObject YES - + YES otherObjectToLocalize_ owner_ @@ -777,7 +865,7 @@ NSObject YES - + YES localizerOwner_ localizer_ @@ -800,7 +888,7 @@ NSView YES - + YES viewToResize_ viewToSlideAndResize_ @@ -844,10 +932,17 @@ + NSView + + IBProjectSource + browser/cocoa/view_id_util.h + + + NSWindow IBProjectSource - browser/cocoa/chrome_browser_window.h + browser/cocoa/framed_browser_window.h @@ -861,24 +956,14 @@ SimpleContentExceptionsWindowController NSWindowController - YES - - YES - closeSheet: - removeAll: - removeRow: - - - YES - id - id - id - + closeSheet: + id YES - + YES + arrayController_ doneButton_ removeAllButton_ removeButton_ @@ -886,6 +971,7 @@ YES + TableModelArrayController NSButton NSButton NSButton @@ -897,9 +983,764 @@ browser/cocoa/simple_content_exceptions_window_controller.h + + TableModelArrayController + NSArrayController + + removeAll: + id + + + IBProjectSource + browser/cocoa/table_model_array_controller.h + + - - 0 + + 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 + + + + 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 + + + + NSObject + + IBFrameworkSource + AddressBook.framework/Headers/ABActions.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAlert.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAnimation.h + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSBrowser.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSComboBox.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSComboBoxCell.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDatePickerCell.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSImage.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/NSRuleEditor.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSound.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSpeechRecognizer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSpeechSynthesizer.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSplitView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTabView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSText.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTextStorage.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTextView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTokenField.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTokenFieldCell.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbar.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSConnection.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/NSMetadata.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSNetServices.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPort.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/NSSpellServer.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSStream.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 + Foundation.framework/Headers/NSXMLParser.h + + + + NSObject + + IBFrameworkSource + Print.framework/Headers/PDEPluginInterface.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 + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSScrollView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSScrollView.h + + + + NSScroller + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSScroller.h + + + + NSTableColumn + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableColumn.h + + + + NSTableHeaderView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTableHeaderView.h + + + + NSTableView + NSControl + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSWindow + + + + NSWindow + NSResponder + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSWindowScripting.h + + + + NSWindowController + NSResponder + + showWindow: + id + + + IBFrameworkSource + AppKit.framework/Headers/NSWindowController.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES ../../chrome.xcodeproj 3 -- cgit v1.1