diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 20:32:50 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 20:32:50 +0000 |
| commit | ca6c990f200c470f2f026ccafac39e29a23c26f2 (patch) | |
| tree | b102e3fc82137c824530017a255ecd35ede96111 | |
| parent | 9935e9f58cc7fd518da760d563d9f360c0ace9da (diff) | |
| download | chromium_src-ca6c990f200c470f2f026ccafac39e29a23c26f2.zip chromium_src-ca6c990f200c470f2f026ccafac39e29a23c26f2.tar.gz chromium_src-ca6c990f200c470f2f026ccafac39e29a23c26f2.tar.bz2 | |
[Mac] Add a preference for Instant search.
XIB Changes (Preferences.xib):
* Add a NSButton checkbox for the Instant preference as an outlet (not with
bindings). Hook up the action of the button to First Responder.
* Add a "Learn more" link for Instant that sends the action to First Responder.
* Increase the size of the Basics view to accommodate those new subviews.
Note that this will not be properly sized-to-fit in some locales. See
http://crbug.com/64090 for details.
BUG=63651
TEST=Chromium-->Preferences. Toggle Instant and get the info sheet. Pressing OK enables it, Cancel does not.
TEST=After the first enabling, the sheet does not appear again.
Review URL: http://codereview.chromium.org/5090007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66994 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/nibs/InstantConfirm.xib | 1386 | ||||
| -rw-r--r-- | chrome/app/nibs/Preferences.xib | 682 | ||||
| -rw-r--r-- | chrome/browser/cocoa/instant_confirm_window_controller.h | 43 | ||||
| -rw-r--r-- | chrome/browser/cocoa/instant_confirm_window_controller.mm | 76 | ||||
| -rw-r--r-- | chrome/browser/cocoa/instant_confirm_window_controller_unittest.mm | 36 | ||||
| -rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.h | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.mm | 36 | ||||
| -rw-r--r-- | chrome/browser/instant/instant_confirm_dialog.cc | 7 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 3 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 3 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 1 |
11 files changed, 2244 insertions, 33 deletions
diff --git a/chrome/app/nibs/InstantConfirm.xib b/chrome/app/nibs/InstantConfirm.xib new file mode 100644 index 0000000..159f897 --- /dev/null +++ b/chrome/app/nibs/InstantConfirm.xib @@ -0,0 +1,1386 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> + <data> + <int key="IBDocument.SystemTarget">1050</int> + <string key="IBDocument.SystemVersion">10F569</string> + <string key="IBDocument.InterfaceBuilderVersion">804</string> + <string key="IBDocument.AppKitVersion">1038.29</string> + <string key="IBDocument.HIToolboxVersion">461.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="NS.object.0">804</string> + </object> + <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="2"/> + </object> + <object class="NSArray" key="IBDocument.PluginDependencies"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys" id="0"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSCustomObject" id="1001"> + <string key="NSClassName">InstantConfirmWindowController</string> + </object> + <object class="NSCustomObject" id="1003"> + <string key="NSClassName">FirstResponder</string> + </object> + <object class="NSCustomObject" id="1004"> + <string key="NSClassName">NSApplication</string> + </object> + <object class="NSWindowTemplate" id="1005"> + <int key="NSWindowStyleMask">7</int> + <int key="NSWindowBacking">2</int> + <string key="NSWindowRect">{{196, 320}, {470, 190}}</string> + <int key="NSWTFlags">544735232</int> + <string key="NSWindowTitle">^IDS_INSTANT_OPT_IN_TITLE</string> + <string key="NSWindowClass">NSWindow</string> + <nil key="NSViewClass"/> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <object class="NSView" key="NSWindowView" id="1006"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="794136076"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 65}, {436, 105}}</string> + <reference key="NSSuperview" ref="1006"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="892950530"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">272629760</int> + <string key="NSContents">^IDS_INSTANT_OPT_IN_MESSAGE</string> + <object class="NSFont" key="NSSupport"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">16</int> + </object> + <reference key="NSControlView" ref="794136076"/> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlTextColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MAA</bytes> + </object> + </object> + </object> + </object> + <object class="NSCustomView" id="737244935"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">292</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="632851681"> + <reference key="NSNextResponder" ref="737244935"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{20, 20}, {96, 16}}</string> + <reference key="NSSuperview" ref="737244935"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="980063444"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">^IDS_LEARN_MORE</string> + <object class="NSFont" key="NSSupport" id="932337151"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="632851681"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">134</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrameSize">{136, 56}</string> + <reference key="NSSuperview" ref="1006"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> + </object> + <object class="NSCustomView" id="201051373"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">289</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="512974612"> + <reference key="NSNextResponder" ref="201051373"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{110, 12}, {96, 32}}</string> + <reference key="NSSuperview" ref="201051373"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="897506623"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_OK</string> + <reference key="NSSupport" ref="932337151"/> + <reference key="NSControlView" ref="512974612"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="783935168"> + <reference key="NSNextResponder" ref="201051373"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{14, 12}, {96, 32}}</string> + <reference key="NSSuperview" ref="201051373"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="928516474"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_CANCEL</string> + <reference key="NSSupport" ref="932337151"/> + <reference key="NSControlView" ref="783935168"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrame">{{250, -2}, {220, 60}}</string> + <reference key="NSSuperview" ref="1006"/> + <string key="NSClassName">NSView</string> + </object> + </object> + <string key="NSFrameSize">{470, 190}</string> + <reference key="NSSuperview"/> + </object> + <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + </object> + <object class="NSCustomObject" id="444963714"> + <string key="NSClassName">ChromeUILocalizer</string> + </object> + </object> + <object class="IBObjectContainer" key="IBDocument.Objects"> + <object class="NSMutableArray" key="connectionRecords"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">owner_</string> + <reference key="source" ref="444963714"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">8</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="1005"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">9</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">window</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">10</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">learnMore:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="632851681"/> + </object> + <int key="connectionID">15</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">cancel:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="783935168"/> + </object> + <int key="connectionID">16</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">ok:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="512974612"/> + </object> + <int key="connectionID">17</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">description_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="794136076"/> + </object> + <int key="connectionID">20</int> + </object> + </object> + <object class="IBMutableOrderedSet" key="objectRecords"> + <object class="NSArray" key="orderedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBObjectRecord"> + <int key="objectID">0</int> + <reference key="object" ref="0"/> + <reference key="children" ref="1000"/> + <nil key="parent"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-2</int> + <reference key="object" ref="1001"/> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-1</int> + <reference key="object" ref="1003"/> + <reference key="parent" ref="0"/> + <string key="objectName">First Responder</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-3</int> + <reference key="object" ref="1004"/> + <reference key="parent" ref="0"/> + <string key="objectName">Application</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1</int> + <reference key="object" ref="1005"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1006"/> + </object> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2</int> + <reference key="object" ref="1006"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="794136076"/> + <reference ref="737244935"/> + <reference ref="201051373"/> + </object> + <reference key="parent" ref="1005"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7</int> + <reference key="object" ref="444963714"/> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">13</int> + <reference key="object" ref="794136076"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="892950530"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">14</int> + <reference key="object" ref="892950530"/> + <reference key="parent" ref="794136076"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">18</int> + <reference key="object" ref="737244935"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="632851681"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">11</int> + <reference key="object" ref="632851681"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="980063444"/> + </object> + <reference key="parent" ref="737244935"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">12</int> + <reference key="object" ref="980063444"/> + <reference key="parent" ref="632851681"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">19</int> + <reference key="object" ref="201051373"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="783935168"/> + <reference ref="512974612"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5</int> + <reference key="object" ref="783935168"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="928516474"/> + </object> + <reference key="parent" ref="201051373"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6</int> + <reference key="object" ref="928516474"/> + <reference key="parent" ref="783935168"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">3</int> + <reference key="object" ref="512974612"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="897506623"/> + </object> + <reference key="parent" ref="201051373"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">4</int> + <reference key="object" ref="897506623"/> + <reference key="parent" ref="512974612"/> + </object> + </object> + </object> + <object class="NSMutableDictionary" key="flattenedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>-1.IBPluginDependency</string> + <string>-2.IBPluginDependency</string> + <string>-3.IBPluginDependency</string> + <string>1.IBEditorWindowLastContentRect</string> + <string>1.IBPluginDependency</string> + <string>1.IBWindowTemplateEditedContentRect</string> + <string>1.NSWindowTemplate.visibleAtLaunch</string> + <string>1.WindowOrigin</string> + <string>1.editorWindowContentRectSynchronizationRect</string> + <string>11.IBViewBoundsToFrameTransform</string> + <string>12.CustomClassName</string> + <string>13.IBPluginDependency</string> + <string>13.IBViewBoundsToFrameTransform</string> + <string>14.IBPluginDependency</string> + <string>18.IBViewBoundsToFrameTransform</string> + <string>19.IBViewBoundsToFrameTransform</string> + <string>2.IBPluginDependency</string> + <string>3.IBPluginDependency</string> + <string>3.IBViewBoundsToFrameTransform</string> + <string>4.IBPluginDependency</string> + <string>5.IBPluginDependency</string> + <string>5.IBViewBoundsToFrameTransform</string> + <string>6.IBPluginDependency</string> + <string>7.IBPluginDependency</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{632, 811}, {470, 190}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{632, 811}, {470, 190}}</string> + <boolean value="NO"/> + <string>{196, 240}</string> + <string>{{357, 418}, {480, 270}}</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwhAAAA</bytes> + </object> + <string>HyperlinkButtonCell</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDTQAAw4YAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"/> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">AUN6AADAAAAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDtAAAwigAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDhAAAwigAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + </object> + </object> + <object class="NSMutableDictionary" key="unlocalizedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="activeLocalization"/> + <object class="NSMutableDictionary" key="localizations"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="sourceID"/> + <int key="maxID">20</int> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"> + <object class="NSMutableArray" key="referencedPartialClassDescriptions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">ChromeUILocalizer</string> + <string key="superclassName">GTMUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/ui_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizer</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">otherObjectToLocalize_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">owner_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">yetAnotherObjectToLocalize_</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMWidthBasedTweaker</string> + <string key="superclassName">NSView</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>viewToResize_</string> + <string>viewToSlideAndResize_</string> + <string>viewToSlide_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>NSView</string> + <string>NSView</string> + </object> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>viewToResize_</string> + <string>viewToSlideAndResize_</string> + <string>viewToSlide_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">viewToResize_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">viewToSlideAndResize_</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">viewToSlide_</string> + <string key="candidateClassName">NSView</string> + </object> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">HyperlinkButtonCell</string> + <string key="superclassName">NSButtonCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/hyperlink_button_cell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">InstantConfirmWindowController</string> + <string key="superclassName">NSWindowController</string> + <object class="NSMutableDictionary" key="actions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>cancel:</string> + <string>learnMore:</string> + <string>ok:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>cancel:</string> + <string>learnMore:</string> + <string>ok:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">cancel:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">learnMore:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">ok:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">description_</string> + <string key="NS.object.0">NSTextField</string> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">description_</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">description_</string> + <string key="candidateClassName">NSTextField</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/instant_confirm_window_controller.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/objc_zombie.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/status_bubble_mac.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/view_id_util.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/framed_browser_window.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/nswindow_additions.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/themed_window.h</string> + </object> + </object> + </object> + <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">NSActionCell</string> + <string key="superclassName">NSCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <string key="superclassName">NSResponder</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1029099174"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="143673678"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="599993151"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSButton</string> + <string key="superclassName">NSControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSButton.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSButtonCell</string> + <string key="superclassName">NSActionCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSCell</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSControl</string> + <string key="superclassName">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="59033906"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSFormatter</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSMenu</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="611086734"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AddressBook.framework/Headers/ABActions.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSAlert.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSAnimation.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="1029099174"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="143673678"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="599993151"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSComboBox.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSComboBoxCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="59033906"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSDatePickerCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="561389400"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSImage.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="611086734"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSRuleEditor.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSSound.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSSpeechRecognizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSSpeechSynthesizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTabView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSText.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTextStorage.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTextView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTokenField.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTokenFieldCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSToolbar.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="107973899"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="509667423"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSConnection.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSError.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSMetadata.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSObject.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSPort.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSSpellServer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSStream.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSThread.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSURL.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Print.framework/Headers/PDEPluginInterface.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">SecurityInterface.framework/Headers/SFAuthorizationView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">SecurityInterface.framework/Headers/SFCertificatePanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">SecurityInterface.framework/Headers/SFChooseIdentityPanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSResponder</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSResponder</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSTextField</string> + <string key="superclassName">NSControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSTextFieldCell</string> + <string key="superclassName">NSActionCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <string key="superclassName">NSResponder</string> + <reference key="sourceIdentifier" ref="107973899"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <reference key="sourceIdentifier" ref="561389400"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <string key="superclassName">NSResponder</string> + <reference key="sourceIdentifier" ref="509667423"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindowController</string> + <string key="superclassName">NSResponder</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">showWindow:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">showWindow:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">showWindow:</string> + <string key="candidateClassName">id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string> + </object> + </object> + </object> + </object> + <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> + <integer value="1050" key="NS.object.0"/> + </object> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> + <integer value="3000" key="NS.object.0"/> + </object> + <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> + <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string> + <int key="IBDocument.defaultPropertyAccessControl">3</int> + </data> +</archive> diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib index d68c5de..9d5a9d9 100644 --- a/chrome/app/nibs/Preferences.xib +++ b/chrome/app/nibs/Preferences.xib @@ -3,20 +3,20 @@ <data> <int key="IBDocument.SystemTarget">1050</int> <string key="IBDocument.SystemVersion">10F569</string> - <string key="IBDocument.InterfaceBuilderVersion">788</string> + <string key="IBDocument.InterfaceBuilderVersion">804</string> <string key="IBDocument.AppKitVersion">1038.29</string> <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">788</string> + <string key="NS.object.0">804</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="692"/> - <integer value="482"/> <integer value="483"/> - <integer value="74"/> <integer value="481"/> + <integer value="74"/> + <integer value="482"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -842,10 +842,52 @@ <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="97616727"> + <reference key="NSNextResponder" ref="930668015"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{192, 80}, {96, 16}}</string> + <reference key="NSSuperview" ref="930668015"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="195905329"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">^IDS_LEARN_MORE</string> + <reference key="NSSupport" ref="445696277"/> + <reference key="NSControlView" ref="97616727"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">134</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="846108626"> + <reference key="NSNextResponder" ref="930668015"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{190, 98}, {352, 18}}</string> + <reference key="NSSuperview" ref="930668015"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="843802055"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">^IDS_INSTANT_PREF</string> + <reference key="NSSupport" ref="445696277"/> + <reference key="NSControlView" ref="846108626"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="434417247"/> + <reference key="NSAlternateImage" ref="927168675"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> <object class="NSTextField" id="325467010"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 279}, {168, 146}}</string> + <string key="NSFrame">{{17, 311}, {168, 146}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="542921234"> @@ -861,7 +903,7 @@ <object class="NSMatrix" id="1016627403"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{192, 367}, {328, 58}}</string> + <string key="NSFrame">{{192, 399}, {328, 58}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <int key="NSNumRows">3</int> @@ -1188,7 +1230,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSButton" id="810089388"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{315, 278}, {205, 23}}</string> + <string key="NSFrame">{{315, 310}, {205, 23}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="788559409"> @@ -1208,7 +1250,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSButton" id="940065158"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{264, 278}, {52, 23}}</string> + <string key="NSFrame">{{264, 310}, {52, 23}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="517413682"> @@ -1232,7 +1274,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSButton" id="909713979"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{213, 278}, {52, 23}}</string> + <string key="NSFrame">{{213, 310}, {52, 23}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="709698869"> @@ -1368,7 +1410,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <double key="NSPercent">0.57142859999999995</double> </object> </object> - <string key="NSFrame">{{213, 298}, {307, 65}}</string> + <string key="NSFrame">{{213, 330}, {307, 65}}</string> <reference key="NSSuperview" ref="930668015"/> <reference key="NSNextKeyView" ref="570210247"/> <int key="NSsFlags">530</int> @@ -1380,7 +1422,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSTextField" id="982570975"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 188}, {168, 64}}</string> + <string key="NSFrame">{{17, 220}, {168, 64}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="901046858"> @@ -1396,7 +1438,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSTextField" id="188533588"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{213, 188}, {307, 22}}</string> + <string key="NSFrame">{{213, 220}, {307, 22}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="771835631"> @@ -1423,7 +1465,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSMatrix" id="743261621"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{192, 214}, {328, 38}}</string> + <string key="NSFrame">{{192, 246}, {328, 38}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <int key="NSNumRows">2</int> @@ -1615,7 +1657,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSTextField" id="881113898"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 121}, {168, 39}}</string> + <string key="NSFrame">{{17, 153}, {168, 39}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="519689237"> @@ -1631,7 +1673,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSButton" id="136601899"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{190, 142}, {332, 18}}</string> + <string key="NSFrame">{{190, 174}, {332, 18}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="131780438"> @@ -1653,7 +1695,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSButton" id="19477846"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">265</int> - <string key="NSFrame">{{431, 85}, {95, 32}}</string> + <string key="NSFrame">{{431, 117}, {95, 32}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="580118686"> @@ -1674,7 +1716,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSTextField" id="254133467"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 93}, {168, 19}}</string> + <string key="NSFrame">{{17, 125}, {168, 19}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="952238196"> @@ -1690,7 +1732,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSPopUpButton" id="803459266"> <reference key="NSNextResponder" ref="930668015"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{189, 89}, {243, 26}}</string> + <string key="NSFrame">{{189, 121}, {243, 26}}</string> <reference key="NSSuperview" ref="930668015"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="197973245"> @@ -1796,7 +1838,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> </object> - <string key="NSFrameSize">{540, 445}</string> + <string key="NSFrameSize">{540, 477}</string> <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> @@ -4051,6 +4093,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">767</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">learnMoreAboutInstant:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="97616727"/> + </object> + <int key="connectionID">785</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">toggleInstant:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="846108626"/> + </object> + <int key="connectionID">786</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">instantCheckbox_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="846108626"/> + </object> + <int key="connectionID">787</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -4432,10 +4498,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="136601899"/> <reference ref="19477846"/> <reference ref="803459266"/> - <reference ref="192681043"/> - <reference ref="402804707"/> - <reference ref="495791200"/> <reference ref="254133467"/> + <reference ref="495791200"/> + <reference ref="402804707"/> + <reference ref="192681043"/> + <reference ref="846108626"/> + <reference ref="97616727"/> </object> <reference key="parent" ref="0"/> <string key="objectName">Basics View</string> @@ -5402,6 +5470,34 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="object" ref="146213088"/> <reference key="parent" ref="1011623445"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">768</int> + <reference key="object" ref="846108626"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="843802055"/> + </object> + <reference key="parent" ref="930668015"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">769</int> + <reference key="object" ref="843802055"/> + <reference key="parent" ref="846108626"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">778</int> + <reference key="object" ref="97616727"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="195905329"/> + </object> + <reference key="parent" ref="930668015"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">779</int> + <reference key="object" ref="195905329"/> + <reference key="parent" ref="97616727"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -5450,6 +5546,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>3.IBWindowTemplateEditedContentRect</string> <string>3.NSWindowTemplate.visibleAtLaunch</string> <string>304.IBPluginDependency</string> + <string>304.IBViewBoundsToFrameTransform</string> <string>305.IBPluginDependency</string> <string>31.IBPluginDependency</string> <string>32.IBPluginDependency</string> @@ -5485,7 +5582,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>43.IBPluginDependency</string> <string>430.IBPluginDependency</string> <string>44.IBPluginDependency</string> + <string>44.IBViewBoundsToFrameTransform</string> <string>45.IBPluginDependency</string> + <string>45.IBViewBoundsToFrameTransform</string> <string>457.IBPluginDependency</string> <string>458.CustomClassName</string> <string>458.IBPluginDependency</string> @@ -5504,6 +5603,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>485.IBEditorWindowLastContentRect</string> <string>485.IBPluginDependency</string> <string>49.IBPluginDependency</string> + <string>49.IBViewBoundsToFrameTransform</string> <string>493.IBPluginDependency</string> <string>493.toolbarItem.selectable</string> <string>494.IBPluginDependency</string> @@ -5591,8 +5691,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>71.IBPluginDependency</string> <string>74.IBEditorWindowLastContentRect</string> <string>74.IBPluginDependency</string> + <string>747.IBViewBoundsToFrameTransform</string> <string>748.CustomClassName</string> + <string>768.IBPluginDependency</string> + <string>768.IBViewBoundsToFrameTransform</string> + <string>769.IBPluginDependency</string> <string>77.IBPluginDependency</string> + <string>778.IBViewBoundsToFrameTransform</string> + <string>779.CustomClassName</string> <string>78.IBPluginDependency</string> <string>79.IBPluginDependency</string> <string>80.IBPluginDependency</string> @@ -5653,6 +5759,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>{{329, 154}, {450, 286}}</string> <boolean value="NO"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDPQAAwgwAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5688,7 +5797,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDOgAAwoYAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwngAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>HyperlinkButtonCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5697,18 +5812,21 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{329, 379}, {540, 445}}</string> + <string>{{728, 128}, {540, 477}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> <bool key="EncodedWithXMLCoder">YES</bool> </object> <string>{{329, 497}, {540, 359}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{278, 393}, {540, 463}}</string> + <string>{{329, 393}, {540, 463}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{682, 562}, {616, 0}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDPgAAwzsAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5796,8 +5914,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{389, 7}, {443, 849}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCMAAAwggAAA</bytes> + </object> <string>HyperlinkButtonCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDOQAAwuQAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDQAAAwrQAAA</bytes> + </object> + <string>HyperlinkButtonCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5831,7 +5961,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">767</int> + <int key="maxID">787</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -6138,6 +6268,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>doSyncCustomize:</string> <string>doSyncReauthentication:</string> <string>importData:</string> + <string>learnMoreAboutInstant:</string> <string>makeDefaultBrowser:</string> <string>manageSearchEngines:</string> <string>openProxyPreferences:</string> @@ -6184,6 +6315,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -6199,6 +6331,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>doSyncCustomize:</string> <string>doSyncReauthentication:</string> <string>importData:</string> + <string>learnMoreAboutInstant:</string> <string>makeDefaultBrowser:</string> <string>manageSearchEngines:</string> <string>openProxyPreferences:</string> @@ -6256,6 +6389,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> + <string key="name">learnMoreAboutInstant:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> <string key="name">makeDefaultBrowser:</string> <string key="candidateClassName">id</string> </object> @@ -6602,6 +6739,501 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> </object> + <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">PreferencesWindowController</string> + <string key="superclassName">NSWindowController</string> + <object class="NSMutableDictionary" key="actions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addHomepage:</string> + <string>backgroundModeLearnMore:</string> + <string>browseDownloadLocation:</string> + <string>changeFontAndLanguageSettings:</string> + <string>clearData:</string> + <string>doSyncAction:</string> + <string>doSyncCustomize:</string> + <string>doSyncReauthentication:</string> + <string>importData:</string> + <string>learnMoreAboutInstant:</string> + <string>makeDefaultBrowser:</string> + <string>manageSearchEngines:</string> + <string>openProxyPreferences:</string> + <string>privacyLearnMore:</string> + <string>removeSelectedHomepages:</string> + <string>resetAutoOpenFiles:</string> + <string>resetThemeToDefault:</string> + <string>resetToDefaults:</string> + <string>showAutoFillSettings:</string> + <string>showCertificates:</string> + <string>showContentSettings:</string> + <string>showPreferences:</string> + <string>showPrivacyDashboard:</string> + <string>showSavedPasswords:</string> + <string>themesGallery:</string> + <string>toggleInstant:</string> + <string>toolbarButtonSelected:</string> + <string>useCurrentPagesAsHomepage:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addHomepage:</string> + <string>backgroundModeLearnMore:</string> + <string>browseDownloadLocation:</string> + <string>changeFontAndLanguageSettings:</string> + <string>clearData:</string> + <string>doSyncAction:</string> + <string>doSyncCustomize:</string> + <string>doSyncReauthentication:</string> + <string>importData:</string> + <string>learnMoreAboutInstant:</string> + <string>makeDefaultBrowser:</string> + <string>manageSearchEngines:</string> + <string>openProxyPreferences:</string> + <string>privacyLearnMore:</string> + <string>removeSelectedHomepages:</string> + <string>resetAutoOpenFiles:</string> + <string>resetThemeToDefault:</string> + <string>resetToDefaults:</string> + <string>showAutoFillSettings:</string> + <string>showCertificates:</string> + <string>showContentSettings:</string> + <string>showPreferences:</string> + <string>showPrivacyDashboard:</string> + <string>showSavedPasswords:</string> + <string>themesGallery:</string> + <string>toggleInstant:</string> + <string>toolbarButtonSelected:</string> + <string>useCurrentPagesAsHomepage:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">addHomepage:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">backgroundModeLearnMore:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">browseDownloadLocation:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">changeFontAndLanguageSettings:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">clearData:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doSyncAction:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doSyncCustomize:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doSyncReauthentication:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">importData:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">learnMoreAboutInstant:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">makeDefaultBrowser:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">manageSearchEngines:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">openProxyPreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">privacyLearnMore:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">removeSelectedHomepages:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">resetAutoOpenFiles:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">resetThemeToDefault:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">resetToDefaults:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showAutoFillSettings:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showCertificates:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showContentSettings:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showPreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showPrivacyDashboard:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showSavedPasswords:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">themesGallery:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleInstant:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toolbarButtonSelected:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">useCurrentPagesAsHomepage:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>autoFillSettingsButton_</string> + <string>backgroundModeCheckbox_</string> + <string>backgroundModeDescription_</string> + <string>backgroundModeLearnMore_</string> + <string>backgroundModeTitle_</string> + <string>basicsGroupDefaultBrowser_</string> + <string>basicsGroupHomePage_</string> + <string>basicsGroupSearchEngine_</string> + <string>basicsGroupStartup_</string> + <string>basicsGroupToolbar_</string> + <string>basicsView_</string> + <string>clearDataButton_</string> + <string>contentSettingsButton_</string> + <string>customPagesArrayController_</string> + <string>downloadLocationButton_</string> + <string>downloadLocationControl_</string> + <string>enableLoggingCheckbox_</string> + <string>instantCheckbox_</string> + <string>managedPrefsBannerView_</string> + <string>managedPrefsBannerWarningImage_</string> + <string>personalStuffGroupAutofill_</string> + <string>personalStuffGroupBrowserData_</string> + <string>personalStuffGroupPasswords_</string> + <string>personalStuffGroupSync_</string> + <string>personalStuffGroupThemes_</string> + <string>personalStuffView_</string> + <string>privacyDashboardLink_</string> + <string>resetFileHandlersButton_</string> + <string>syncButton_</string> + <string>syncCustomizeButton_</string> + <string>syncLink_</string> + <string>syncStatus_</string> + <string>toolbar_</string> + <string>underTheHoodContentView_</string> + <string>underTheHoodScroller_</string> + <string>underTheHoodView_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSButton</string> + <string>NSButton</string> + <string>NSTextField</string> + <string>NSButton</string> + <string>NSTextField</string> + <string>NSArray</string> + <string>NSArray</string> + <string>NSArray</string> + <string>NSArray</string> + <string>NSArray</string> + <string>NSView</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSArrayController</string> + <string>NSButton</string> + <string>NSPathControl</string> + <string>NSButton</string> + <string>NSButton</string> + <string>VerticalGradientView</string> + <string>NSImageView</string> + <string>NSArray</string> + <string>NSArray</string> + <string>NSArray</string> + <string>NSArray</string> + <string>NSArray</string> + <string>NSView</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSTextField</string> + <string>NSToolbar</string> + <string>NSView</string> + <string>NSScrollView</string> + <string>NSView</string> + </object> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>autoFillSettingsButton_</string> + <string>backgroundModeCheckbox_</string> + <string>backgroundModeDescription_</string> + <string>backgroundModeLearnMore_</string> + <string>backgroundModeTitle_</string> + <string>basicsGroupDefaultBrowser_</string> + <string>basicsGroupHomePage_</string> + <string>basicsGroupSearchEngine_</string> + <string>basicsGroupStartup_</string> + <string>basicsGroupToolbar_</string> + <string>basicsView_</string> + <string>clearDataButton_</string> + <string>contentSettingsButton_</string> + <string>customPagesArrayController_</string> + <string>downloadLocationButton_</string> + <string>downloadLocationControl_</string> + <string>enableLoggingCheckbox_</string> + <string>instantCheckbox_</string> + <string>managedPrefsBannerView_</string> + <string>managedPrefsBannerWarningImage_</string> + <string>personalStuffGroupAutofill_</string> + <string>personalStuffGroupBrowserData_</string> + <string>personalStuffGroupPasswords_</string> + <string>personalStuffGroupSync_</string> + <string>personalStuffGroupThemes_</string> + <string>personalStuffView_</string> + <string>privacyDashboardLink_</string> + <string>resetFileHandlersButton_</string> + <string>syncButton_</string> + <string>syncCustomizeButton_</string> + <string>syncLink_</string> + <string>syncStatus_</string> + <string>toolbar_</string> + <string>underTheHoodContentView_</string> + <string>underTheHoodScroller_</string> + <string>underTheHoodView_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">autoFillSettingsButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">backgroundModeCheckbox_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">backgroundModeDescription_</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">backgroundModeLearnMore_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">backgroundModeTitle_</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsGroupDefaultBrowser_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsGroupHomePage_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsGroupSearchEngine_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsGroupStartup_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsGroupToolbar_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsView_</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">clearDataButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">contentSettingsButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">customPagesArrayController_</string> + <string key="candidateClassName">NSArrayController</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">downloadLocationButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">downloadLocationControl_</string> + <string key="candidateClassName">NSPathControl</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">enableLoggingCheckbox_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">instantCheckbox_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">managedPrefsBannerView_</string> + <string key="candidateClassName">VerticalGradientView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">managedPrefsBannerWarningImage_</string> + <string key="candidateClassName">NSImageView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffGroupAutofill_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffGroupBrowserData_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffGroupPasswords_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffGroupSync_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffGroupThemes_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffView_</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">privacyDashboardLink_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">resetFileHandlersButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">syncButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">syncCustomizeButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">syncLink_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">syncStatus_</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">toolbar_</string> + <string key="candidateClassName">NSToolbar</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">underTheHoodContentView_</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">underTheHoodScroller_</string> + <string key="candidateClassName">NSScrollView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">underTheHoodView_</string> + <string key="candidateClassName">NSView</string> + </object> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBDocumentRelativeSource</string> + <string key="minorKey">../../browser/cocoa/preferences_window_controller.h</string> + </object> + </object> + </object> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> diff --git a/chrome/browser/cocoa/instant_confirm_window_controller.h b/chrome/browser/cocoa/instant_confirm_window_controller.h new file mode 100644 index 0000000..f721af7 --- /dev/null +++ b/chrome/browser/cocoa/instant_confirm_window_controller.h @@ -0,0 +1,43 @@ +// Copyright (c) 2010 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. + +#ifndef CHROME_BROWSER_COCOA_INSTANT_CONFIRM_WINDOW_CONTROLLER_H_ +#define CHROME_BROWSER_COCOA_INSTANT_CONFIRM_WINDOW_CONTROLLER_H_ +#pragma once + +#import <Cocoa/Cocoa.h> + +#import "base/cocoa_protocols_mac.h" + +class Profile; + +// This controller manages a dialog that informs the user about Instant search. +// The recommended API is to not use this class directly, but instead to use +// the functions in //chrome/browser/instant/instant_confirm_dialog.h: +// void ShowInstantConfirmDialog[IfNecessary](gfx::NativeWindow* parent, ...) +// Which will attach the window to |parent| as a sheet. +@interface InstantConfirmWindowController : NSWindowController<NSWindowDelegate> +{ + @private + // The long description about Instant that needs to be sized-to-fit. + IBOutlet NSTextField* description_; + + Profile* profile_; // weak +} + +// Designated initializer. The controller will release itself on window close. +- (id)initWithProfile:(Profile*)profile; + +// Action for the "Learn more" link. +- (IBAction)learnMore:(id)sender; + +// The user has opted in to Instant. This enables the Instant preference. +- (IBAction)ok:(id)sender; + +// Closes the sheet without altering the preference value. +- (IBAction)cancel:(id)sender; + +@end + +#endif // CHROME_BROWSER_COCOA_INSTANT_CONFIRM_WINDOW_CONTROLLER_H_ diff --git a/chrome/browser/cocoa/instant_confirm_window_controller.mm b/chrome/browser/cocoa/instant_confirm_window_controller.mm new file mode 100644 index 0000000..55109cb --- /dev/null +++ b/chrome/browser/cocoa/instant_confirm_window_controller.mm @@ -0,0 +1,76 @@ +// Copyright (c) 2010 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. + +#import "chrome/browser/cocoa/instant_confirm_window_controller.h" + +#include "base/logging.h" +#include "base/mac_util.h" +#include "chrome/browser/instant/instant_confirm_dialog.h" +#include "chrome/browser/instant/instant_controller.h" +#include "chrome/browser/profile.h" +#include "chrome/browser/show_options_url.h" +#include "gfx/native_widget_types.h" +#include "googleurl/src/gurl.h" +#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" + +namespace browser { + +void ShowInstantConfirmDialog(gfx::NativeWindow parent, Profile* profile) { + InstantConfirmWindowController* controller = + [[InstantConfirmWindowController alloc] initWithProfile:profile]; + [NSApp beginSheet:[controller window] + modalForWindow:parent + modalDelegate:nil + didEndSelector:NULL + contextInfo:NULL]; +} + +} // namespace browser + +@implementation InstantConfirmWindowController + +- (id)initWithProfile:(Profile*)profile { + NSString* nibPath = [mac_util::MainAppBundle() + pathForResource:@"InstantConfirm" + ofType:@"nib"]; + if ((self = [super initWithWindowNibPath:nibPath owner:self])) { + profile_ = profile; + } + return self; +} + +- (void)awakeFromNib { + DCHECK([self window]); + DCHECK_EQ(self, [[self window] delegate]); + + CGFloat delta = [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField: + description_]; + NSRect descriptionFrame = [description_ frame]; + descriptionFrame.origin.y -= delta; + [description_ setFrame:descriptionFrame]; + + NSRect frame = [[self window] frame]; + frame.size.height += delta; + [[self window] setFrame:frame display:YES]; +} + +- (void)windowWillClose:(NSNotification*)notif { + [self autorelease]; +} + +- (IBAction)learnMore:(id)sender { + browser::ShowOptionsURL(profile_, GURL(browser::kInstantLearnMoreURL)); +} + +- (IBAction)ok:(id)sender { + InstantController::Enable(profile_); + [self cancel:sender]; +} + +- (IBAction)cancel:(id)sender { + [NSApp endSheet:[self window]]; + [[self window] close]; +} + +@end diff --git a/chrome/browser/cocoa/instant_confirm_window_controller_unittest.mm b/chrome/browser/cocoa/instant_confirm_window_controller_unittest.mm new file mode 100644 index 0000000..ec545bc --- /dev/null +++ b/chrome/browser/cocoa/instant_confirm_window_controller_unittest.mm @@ -0,0 +1,36 @@ +// Copyright (c) 2010 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. + +#import "chrome/browser/cocoa/instant_confirm_window_controller.h" + +#import "chrome/browser/cocoa/browser_test_helper.h" +#import "chrome/browser/cocoa/cocoa_test_helper.h" +#include "chrome/browser/instant/instant_confirm_dialog.h" + +namespace { + +class InstantConfirmWindowControllerTest : public CocoaTest { + public: + InstantConfirmWindowControllerTest() : controller_(nil) {} + + BrowserTestHelper helper_; + InstantConfirmWindowController* controller_; // Weak. Owns self. +}; + +TEST_F(InstantConfirmWindowControllerTest, Init) { + controller_ = + [[InstantConfirmWindowController alloc] initWithProfile: + helper_.profile()]; + EXPECT_TRUE([controller_ window]); + [controller_ release]; +} + +TEST_F(InstantConfirmWindowControllerTest, Show) { + browser::ShowInstantConfirmDialog(test_window(), helper_.profile()); + controller_ = [[test_window() attachedSheet] windowController]; + EXPECT_TRUE(controller_); + [controller_ cancel:nil]; +} + +} // namespace diff --git a/chrome/browser/cocoa/preferences_window_controller.h b/chrome/browser/cocoa/preferences_window_controller.h index e6f1be4..1f5a295 100644 --- a/chrome/browser/cocoa/preferences_window_controller.h +++ b/chrome/browser/cocoa/preferences_window_controller.h @@ -89,6 +89,8 @@ class ProfileSyncService; BooleanPrefMember newTabPageIsHomePage_; StringPrefMember homepage_; BooleanPrefMember showHomeButton_; + BooleanPrefMember instantEnabled_; + IBOutlet NSButton* instantCheckbox_; scoped_nsobject<SearchEngineListModel> searchEngineModel_; // Used when creating a new home page url to make the new cell editable. BOOL pendingSelectForEdit_; @@ -167,6 +169,8 @@ class ProfileSyncService; - (IBAction)removeSelectedHomepages:(id)sender; - (IBAction)useCurrentPagesAsHomepage:(id)sender; - (IBAction)manageSearchEngines:(id)sender; +- (IBAction)toggleInstant:(id)sender; +- (IBAction)learnMoreAboutInstant:(id)sender; - (IBAction)makeDefaultBrowser:(id)sender; // User Data panel diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index c02d316..cf06527 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -33,6 +33,8 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/google/google_util.h" +#include "chrome/browser/instant/instant_confirm_dialog.h" +#include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" @@ -334,6 +336,7 @@ CGFloat AutoSizeUnderTheHoodContent(NSView* view, // Record the user performed a certain action and save the preferences. - (void)recordUserAction:(const UserMetricsAction&) action; - (void)registerPrefObservers; +- (void)configureInstant; // KVC setter methods. - (void)setNewTabPageIsHomePageIndex:(NSInteger)val; @@ -585,6 +588,8 @@ class ManagedPrefsBannerState : public policy::ManagedPrefsBannerBase { DCHECK_EQ(defaultBrowserChange.height, 0.0) << "Button should have been right height in nib"; + [self configureInstant]; + // Size the sync row. CGFloat syncRowChange = SizeToFitButtonPair(syncButton_, syncCustomizeButton_); @@ -798,6 +803,7 @@ class ManagedPrefsBannerState : public policy::ManagedPrefsBannerBase { prefs_, observer_.get()); homepage_.Init(prefs::kHomePage, prefs_, observer_.get()); showHomeButton_.Init(prefs::kShowHomeButton, prefs_, observer_.get()); + instantEnabled_.Init(prefs::kInstantEnabled, prefs_, observer_.get()); // Personal Stuff panel askSavePasswords_.Init(prefs::kPasswordManagerEnabled, @@ -936,6 +942,8 @@ class ManagedPrefsBannerState : public policy::ManagedPrefsBannerBase { } else if (*prefName == prefs::kShowHomeButton) { [self setShowHomeButton:showHomeButton_.GetValue() ? YES : NO]; [self setShowHomeButtonEnabled:!showHomeButton_.IsManaged()]; + } else if (*prefName == prefs::kInstantEnabled) { + [self configureInstant]; } } @@ -1186,6 +1194,34 @@ enum { kHomepageNewTabPage, kHomepageURL }; [KeywordEditorCocoaController showKeywordEditor:profile_]; } +- (IBAction)toggleInstant:(id)sender { + if (instantEnabled_.GetValue()) { + InstantController::Disable(profile_); + } else { + [instantCheckbox_ setState:NSOffState]; + browser::ShowInstantConfirmDialogIfNecessary([self window], profile_); + } +} + +// Sets the state of the Instant checkbox and adds the type information to the +// label. +- (void)configureInstant { + bool enabled = instantEnabled_.GetValue(); + NSInteger state = enabled ? NSOnState : NSOffState; + [instantCheckbox_ setState:state]; + + NSString* title = l10n_util::GetNSStringWithFixup(IDS_INSTANT_PREF); + if (enabled) { + title = [NSString stringWithFormat:@"%@ [%d]", title, + prefs_->GetInteger(prefs::kInstantType)]; + } + [instantCheckbox_ setTitle:title]; +} + +- (IBAction)learnMoreAboutInstant:(id)sender { + browser::ShowOptionsURL(profile_, GURL(browser::kInstantLearnMoreURL)); +} + // Called when the user clicks the button to make Chromium the default // browser. Registers http and https. - (IBAction)makeDefaultBrowser:(id)sender { diff --git a/chrome/browser/instant/instant_confirm_dialog.cc b/chrome/browser/instant/instant_confirm_dialog.cc index e59a30b..cf7c7fd 100644 --- a/chrome/browser/instant/instant_confirm_dialog.cc +++ b/chrome/browser/instant/instant_confirm_dialog.cc @@ -33,11 +33,4 @@ void ShowInstantConfirmDialogIfNecessary(gfx::NativeWindow parent, ShowInstantConfirmDialog(parent, profile); } -#if !defined(TOOLKIT_VIEWS) && !defined(TOOLKIT_GTK) -void ShowInstantConfirmDialog(gfx::NativeWindow parent, - Profile* profile) { - NOTIMPLEMENTED(); -} -#endif - } // namespace browser diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 168597e..889f5fb 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1043,6 +1043,8 @@ 'browser/cocoa/infobar_test_helper.h', 'browser/cocoa/install_from_dmg.h', 'browser/cocoa/install_from_dmg.mm', + 'browser/cocoa/instant_confirm_window_controller.h', + 'browser/cocoa/instant_confirm_window_controller.mm', 'browser/cocoa/js_modal_dialog_cocoa.h', 'browser/cocoa/js_modal_dialog_cocoa.mm', 'browser/cocoa/keystone_glue.h', @@ -3688,6 +3690,7 @@ 'app/nibs/HungRendererDialog.xib', 'app/nibs/ImportSettingsDialog.xib', 'app/nibs/ImportProgressDialog.xib', + 'app/nibs/InstantConfirm.xib', 'app/nibs/KeywordEditor.xib', 'app/nibs/MainMenu.xib', 'app/nibs/Preferences.xib', diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index ffc6dee..01f3329 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -230,11 +230,12 @@ 'app/nibs/FontLanguageSettings.xib', 'app/nibs/HungRendererDialog.xib', 'app/nibs/HttpAuthLoginSheet.xib', + 'app/nibs/ImportProgressDialog.xib', 'app/nibs/ImportSettingsDialog.xib', 'app/nibs/InfoBar.xib', 'app/nibs/InfoBarContainer.xib', + 'app/nibs/InstantConfirm.xib', 'app/nibs/InstantOptIn.xib', - 'app/nibs/ImportProgressDialog.xib', 'app/nibs/KeywordEditor.xib', 'app/nibs/MainMenu.xib', 'app/nibs/Notification.xib', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 78b6c97..e8bbbbe 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1187,6 +1187,7 @@ 'browser/cocoa/infobar_container_controller_unittest.mm', 'browser/cocoa/infobar_controller_unittest.mm', 'browser/cocoa/infobar_gradient_view_unittest.mm', + 'browser/cocoa/instant_confirm_window_controller_unittest.mm', 'browser/cocoa/keystone_glue_unittest.mm', 'browser/cocoa/keyword_editor_cocoa_controller_unittest.mm', 'browser/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm', |