diff options
author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-26 20:18:18 +0000 |
---|---|---|
committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-26 20:18:18 +0000 |
commit | 863ff66f1c594a17b75e910fb1f5fcb37f230aa8 (patch) | |
tree | f4b5d1854727b5e38fc788dfc4c7da0dd60938ed | |
parent | 406f5e232abb0730009c995af029dfc014df57da (diff) | |
download | chromium_src-863ff66f1c594a17b75e910fb1f5fcb37f230aa8.zip chromium_src-863ff66f1c594a17b75e910fb1f5fcb37f230aa8.tar.gz chromium_src-863ff66f1c594a17b75e910fb1f5fcb37f230aa8.tar.bz2 |
Add some more menu items from cole
Review URL: http://codereview.chromium.org/18776
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8655 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/app/nibs/English.lproj/MainMenu.xib | 699 | ||||
-rw-r--r-- | chrome/browser/app_controller_mac.mm | 4 |
2 files changed, 459 insertions, 244 deletions
diff --git a/chrome/app/nibs/English.lproj/MainMenu.xib b/chrome/app/nibs/English.lproj/MainMenu.xib index a0d3176..21298c0 100644 --- a/chrome/app/nibs/English.lproj/MainMenu.xib +++ b/chrome/app/nibs/English.lproj/MainMenu.xib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9F33</string> + <string key="IBDocument.SystemVersion">9G55</string> <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.34</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="82"/> + <integer value="497"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -86,6 +86,24 @@ <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> + <object class="NSMenuItem" id="446911629"> + <reference key="NSMenu" ref="110575045"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> + <object class="NSMenuItem" id="52470633"> + <reference key="NSMenu" ref="110575045"/> + <string type="base64-UTF8" key="NSTitle">Q2xlYXIgQnJvd3NpbmcgRGF0YeKApg</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> <object class="NSMenuItem" id="481834944"> <reference key="NSMenu" ref="110575045"/> <bool key="NSIsDisabled">YES</bool> @@ -183,6 +201,16 @@ <string key="NSTitle">File</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="603924433"> + <reference key="NSMenu" ref="720053764"/> + <string key="NSTitle">New Tab</string> + <string key="NSKeyEquiv">t</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">34014</int> + </object> <object class="NSMenuItem" id="705341025"> <reference key="NSMenu" ref="720053764"/> <string key="NSTitle">New Window</string> @@ -193,14 +221,14 @@ <reference key="NSMixedImage" ref="549394948"/> <int key="NSTag">34000</int> </object> - <object class="NSMenuItem" id="603924433"> + <object class="NSMenuItem" id="1063389418"> <reference key="NSMenu" ref="720053764"/> - <string key="NSTitle">New Tab</string> - <string key="NSKeyEquiv">t</string> - <int key="NSKeyEquivModMask">1048576</int> + <string key="NSTitle">New Incognito Window</string> + <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">34001</int> </object> <object class="NSMenuItem" id="722745758"> <reference key="NSMenu" ref="720053764"/> @@ -235,6 +263,24 @@ <string key="NSName">_NSRecentDocumentsMenu</string> </object> </object> + <object class="NSMenuItem" id="1033381097"> + <reference key="NSMenu" ref="720053764"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> + <object class="NSMenuItem" id="704317490"> + <reference key="NSMenu" ref="720053764"/> + <string type="base64-UTF8" key="NSTitle">Q3JlYXRlIEFwcGxpY2F0aW9u4oCmA</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> <object class="NSMenuItem" id="425164168"> <reference key="NSMenu" ref="720053764"/> <bool key="NSIsDisabled">YES</bool> @@ -264,9 +310,9 @@ </object> <object class="NSMenuItem" id="117038363"> <reference key="NSMenu" ref="720053764"/> - <string type="base64-UTF8" key="NSTitle">U2F2ZSBBc+KApg</string> - <string key="NSKeyEquiv">S</string> - <int key="NSKeyEquivModMask">1179648</int> + <string type="base64-UTF8" key="NSTitle">U2F2ZSBQYWdl4oCmA</string> + <string key="NSKeyEquiv">s</string> + <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> @@ -379,6 +425,15 @@ <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> + <object class="NSMenuItem" id="442256518"> + <reference key="NSMenu" ref="789758025"/> + <string key="NSTitle">Copy URL</string> + <string key="NSKeyEquiv">c</string> + <int key="NSKeyEquivModMask">1572864</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> <object class="NSMenuItem" id="29853731"> <reference key="NSMenu" ref="789758025"/> <string key="NSTitle">Paste</string> @@ -604,76 +659,66 @@ </object> </object> </object> - <object class="NSMenuItem" id="635340722"> + <object class="NSMenuItem" id="586577488"> <reference key="NSMenu" ref="649796088"/> - <string key="NSTitle">History</string> + <string key="NSTitle">View</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="244177936"> - <string key="NSTitle">History</string> + <object class="NSMenu" key="NSSubmenu" id="466310130"> + <string key="NSTitle">View</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="415440149"> - <reference key="NSMenu" ref="244177936"/> - <string key="NSTitle">Home</string> - <string key="NSKeyEquiv"/> + <object class="NSMenuItem" id="102151532"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Always Show Bookmarks Bar</string> + <string key="NSKeyEquiv">b</string> + <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> - <object class="NSMenuItem" id="48807148"> - <reference key="NSMenu" ref="244177936"/> - <string key="NSTitle">Back</string> + <object class="NSMenuItem" id="946218152"> + <reference key="NSMenu" ref="466310130"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> - <object class="NSMenuItem" id="778334623"> - <reference key="NSMenu" ref="244177936"/> - <string key="NSTitle">Forward</string> - <string key="NSKeyEquiv"/> + <object class="NSMenuItem" id="407239884"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Make Text Bigger</string> + <string key="NSKeyEquiv">=</string> + <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> - </object> - </object> - </object> - <object class="NSMenuItem" id="299901009"> - <reference key="NSMenu" ref="649796088"/> - <string key="NSTitle">Bookmarks</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="353210768"/> - <reference key="NSMixedImage" ref="549394948"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="839200213"> - <string key="NSTitle">Bookmarks</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="525431043"> - <reference key="NSMenu" ref="839200213"/> - <string key="NSTitle">Bookmark Current Page</string> - <string key="NSKeyEquiv">d</string> + <object class="NSMenuItem" id="577314768"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Make Text Default</string> + <string key="NSKeyEquiv">0</string> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> - <object class="NSMenuItem" id="720866399"> - <reference key="NSMenu" ref="839200213"/> - <string key="NSTitle">Bookmark Current Tabs as Tab Group</string> - <string key="NSKeyEquiv"/> + <object class="NSMenuItem" id="115970721"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Make Text Smaller</string> + <string key="NSKeyEquiv">-</string> + <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> - <object class="NSMenuItem" id="369386365"> - <reference key="NSMenu" ref="839200213"/> + <object class="NSMenuItem" id="31790433"> + <reference key="NSMenu" ref="466310130"/> <bool key="NSIsDisabled">YES</bool> <bool key="NSIsSeparator">YES</bool> <string key="NSTitle"/> @@ -682,21 +727,21 @@ <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> - <object class="NSMenuItem" id="337321076"> - <reference key="NSMenu" ref="839200213"/> - <string key="NSTitle">Bonjour</string> + <object class="NSMenuItem" id="602502221"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Text Encoding</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="245976667"> - <string key="NSTitle">Bonjour</string> + <object class="NSMenu" key="NSSubmenu" id="466817936"> + <string key="NSTitle">Text Encoding</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="581498012"> - <reference key="NSMenu" ref="245976667"/> - <string key="NSTitle">Item</string> + <object class="NSMenuItem" id="433074134"> + <reference key="NSMenu" ref="466817936"/> + <string type="base64-UTF8" key="NSTitle">VW5pY29kZeKEoiAoVVRGLTgpA</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> @@ -705,87 +750,76 @@ </object> </object> </object> - <object class="NSMenuItem" id="574125256"> - <reference key="NSMenu" ref="839200213"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> + <object class="NSMenuItem" id="749294230"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Developer</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="99609113"> + <string key="NSTitle">Developer</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="656413452"> + <reference key="NSMenu" ref="99609113"/> + <string key="NSTitle">View Source</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> + </object> + </object> </object> </object> </object> </object> - <object class="NSMenuItem" id="586577488"> + <object class="NSMenuItem" id="445514911"> <reference key="NSMenu" ref="649796088"/> - <string key="NSTitle">View</string> + <string key="NSTitle">History</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="466310130"> - <string key="NSTitle">View</string> + <object class="NSMenu" key="NSSubmenu" id="436720301"> + <string key="NSTitle">History</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="102151532"> - <reference key="NSMenu" ref="466310130"/> - <string key="NSTitle">Show Toolbar</string> - <string key="NSKeyEquiv">t</string> - <int key="NSKeyEquivModMask">1572864</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="353210768"/> - <reference key="NSMixedImage" ref="549394948"/> - </object> - <object class="NSMenuItem" id="237841660"> - <reference key="NSMenu" ref="466310130"/> - <string type="base64-UTF8" key="NSTitle">Q3VzdG9taXplIFRvb2xiYXLigKY</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="353210768"/> - <reference key="NSMixedImage" ref="549394948"/> - </object> - <object class="NSMenuItem" id="946218152"> - <reference key="NSMenu" ref="466310130"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="353210768"/> - <reference key="NSMixedImage" ref="549394948"/> - </object> - <object class="NSMenuItem" id="407239884"> - <reference key="NSMenu" ref="466310130"/> - <string key="NSTitle">Make Text Bigger</string> - <string key="NSKeyEquiv">=</string> + <object class="NSMenuItem" id="168518061"> + <reference key="NSMenu" ref="436720301"/> + <string key="NSTitle">Home</string> + <string key="NSKeyEquiv">H</string> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">33003</int> </object> - <object class="NSMenuItem" id="577314768"> - <reference key="NSMenu" ref="466310130"/> - <string key="NSTitle">Make Text Default</string> - <string key="NSKeyEquiv">0</string> + <object class="NSMenuItem" id="1072249258"> + <reference key="NSMenu" ref="436720301"/> + <string key="NSTitle">Back</string> + <string key="NSKeyEquiv">[</string> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">33000</int> </object> - <object class="NSMenuItem" id="115970721"> - <reference key="NSMenu" ref="466310130"/> - <string key="NSTitle">Make Text Smaller</string> - <string key="NSKeyEquiv">-</string> + <object class="NSMenuItem" id="912432543"> + <reference key="NSMenu" ref="436720301"/> + <string key="NSTitle">Forward</string> + <string key="NSKeyEquiv">]</string> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">33001</int> </object> - <object class="NSMenuItem" id="31790433"> - <reference key="NSMenu" ref="466310130"/> + <object class="NSMenuItem" id="397370115"> + <reference key="NSMenu" ref="436720301"/> <bool key="NSIsDisabled">YES</bool> <bool key="NSIsSeparator">YES</bool> <string key="NSTitle"/> @@ -794,17 +828,39 @@ <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> - <object class="NSMenuItem" id="171825856"> - <reference key="NSMenu" ref="466310130"/> - <string key="NSTitle">View Page Source</string> - <string key="NSKeyEquiv">v</string> - <int key="NSKeyEquivModMask">1572864</int> + <object class="NSMenuItem" id="792145602"> + <reference key="NSMenu" ref="436720301"/> + <string key="NSTitle">history item...</string> + <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> - <object class="NSMenuItem" id="961783792"> - <reference key="NSMenu" ref="466310130"/> + </object> + </object> + </object> + <object class="NSMenuItem" id="299901009"> + <reference key="NSMenu" ref="649796088"/> + <string key="NSTitle">Bookmarks</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="891828782"> + <string key="NSTitle">Bookmarks</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="399860348"> + <reference key="NSMenu" ref="891828782"/> + <string type="base64-UTF8" key="NSTitle">Qm9va21hcmsgQ3VycmVudCBQYWdl4oCmA</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> + <object class="NSMenuItem" id="505033846"> + <reference key="NSMenu" ref="891828782"/> <bool key="NSIsDisabled">YES</bool> <bool key="NSIsSeparator">YES</bool> <string key="NSTitle"/> @@ -813,21 +869,21 @@ <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> </object> - <object class="NSMenuItem" id="602502221"> - <reference key="NSMenu" ref="466310130"/> - <string key="NSTitle">Text Encoding</string> + <object class="NSMenuItem" id="1034669272"> + <reference key="NSMenu" ref="891828782"/> + <string key="NSTitle">Bonjour</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="466817936"> - <string key="NSTitle">Text Encoding</string> + <object class="NSMenu" key="NSSubmenu" id="2554196"> + <string key="NSTitle">Bonjour</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="433074134"> - <reference key="NSMenu" ref="466817936"/> - <string type="base64-UTF8" key="NSTitle">VW5pY29kZeKEoiAoVVRGLTgpA</string> + <object class="NSMenuItem" id="963150272"> + <reference key="NSMenu" ref="2554196"/> + <string key="NSTitle">Item</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> @@ -836,6 +892,40 @@ </object> </object> </object> + <object class="NSMenuItem" id="1024441020"> + <reference key="NSMenu" ref="891828782"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> + <object class="NSMenuItem" id="690079652"> + <reference key="NSMenu" ref="891828782"/> + <string key="NSTitle">Item 1</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> + <object class="NSMenuItem" id="968858508"> + <reference key="NSMenu" ref="891828782"/> + <string key="NSTitle">Item 2</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> + <object class="NSMenuItem" id="25085450"> + <reference key="NSMenu" ref="891828782"/> + <string key="NSTitle">Item 3</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + </object> </object> </object> </object> @@ -1188,14 +1278,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">runToolbarCustomizationPalette:</string> - <reference key="source" ref="1014"/> - <reference key="destination" ref="237841660"/> - </object> - <int key="connectionID">365</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">toggleToolbarShown:</string> <reference key="source" ref="1014"/> <reference key="destination" ref="102151532"/> @@ -1250,6 +1332,46 @@ </object> <int key="connectionID">490</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="1072249258"/> + </object> + <int key="connectionID">522</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="912432543"/> + </object> + <int key="connectionID">523</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="168518061"/> + </object> + <int key="connectionID">524</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="603924433"/> + </object> + <int key="connectionID">525</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="1063389418"/> + </object> + <int key="connectionID">526</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1290,9 +1412,9 @@ <reference ref="391199113"/> <reference ref="952259628"/> <reference ref="379814623"/> - <reference ref="586577488"/> - <reference ref="635340722"/> <reference ref="299901009"/> + <reference ref="586577488"/> + <reference ref="445514911"/> </object> <reference key="parent" ref="1049"/> <string key="objectName">Main Menu</string> @@ -1356,10 +1478,13 @@ <reference ref="776162233"/> <reference ref="425164168"/> <reference ref="1010469920"/> - <reference ref="603924433"/> <reference ref="1059729334"/> <reference ref="120844338"/> <reference ref="553348595"/> + <reference ref="1063389418"/> + <reference ref="603924433"/> + <reference ref="1033381097"/> + <reference ref="704317490"/> </object> <reference key="parent" ref="379814623"/> </object> @@ -1444,6 +1569,7 @@ <reference ref="972420730"/> <reference ref="676164635"/> <reference ref="507821607"/> + <reference ref="442256518"/> </object> <reference key="parent" ref="952259628"/> </object> @@ -1605,6 +1731,8 @@ <reference ref="1046388886"/> <reference ref="1056857174"/> <reference ref="342932134"/> + <reference ref="52470633"/> + <reference ref="446911629"/> </object> <reference key="parent" ref="694149608"/> </object> @@ -1723,15 +1851,13 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="102151532"/> - <reference ref="237841660"/> <reference ref="946218152"/> <reference ref="407239884"/> <reference ref="115970721"/> <reference ref="577314768"/> - <reference ref="171825856"/> <reference ref="31790433"/> - <reference ref="961783792"/> <reference ref="602502221"/> + <reference ref="749294230"/> </object> <reference key="parent" ref="586577488"/> </object> @@ -1741,11 +1867,6 @@ <reference key="parent" ref="466310130"/> </object> <object class="IBObjectRecord"> - <int key="objectID">298</int> - <reference key="object" ref="237841660"/> - <reference key="parent" ref="466310130"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">211</int> <reference key="object" ref="676164635"/> <object class="NSMutableArray" key="children"> @@ -1880,21 +2001,11 @@ <reference key="parent" ref="466310130"/> </object> <object class="IBObjectRecord"> - <int key="objectID">461</int> - <reference key="object" ref="171825856"/> - <reference key="parent" ref="466310130"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">462</int> <reference key="object" ref="31790433"/> <reference key="parent" ref="466310130"/> </object> <object class="IBObjectRecord"> - <int key="objectID">464</int> - <reference key="object" ref="961783792"/> - <reference key="parent" ref="466310130"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">465</int> <reference key="object" ref="602502221"/> <object class="NSMutableArray" key="children"> @@ -1918,109 +2029,186 @@ <reference key="parent" ref="466817936"/> </object> <object class="IBObjectRecord"> - <int key="objectID">468</int> - <reference key="object" ref="635340722"/> + <int key="objectID">473</int> + <reference key="object" ref="299901009"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="244177936"/> + <reference ref="891828782"/> </object> <reference key="parent" ref="649796088"/> </object> <object class="IBObjectRecord"> - <int key="objectID">469</int> - <reference key="object" ref="244177936"/> + <int key="objectID">483</int> + <reference key="object" ref="168151378"/> + <reference key="parent" ref="1049"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">491</int> + <reference key="object" ref="52470633"/> + <reference key="parent" ref="110575045"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">492</int> + <reference key="object" ref="446911629"/> + <reference key="parent" ref="110575045"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">493</int> + <reference key="object" ref="1063389418"/> + <reference key="parent" ref="720053764"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">494</int> + <reference key="object" ref="1033381097"/> + <reference key="parent" ref="720053764"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">495</int> + <reference key="object" ref="704317490"/> + <reference key="parent" ref="720053764"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">496</int> + <reference key="object" ref="442256518"/> + <reference key="parent" ref="789758025"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">501</int> + <reference key="object" ref="749294230"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="415440149"/> - <reference ref="48807148"/> - <reference ref="778334623"/> + <reference ref="99609113"/> </object> - <reference key="parent" ref="635340722"/> + <reference key="parent" ref="466310130"/> </object> <object class="IBObjectRecord"> - <int key="objectID">470</int> - <reference key="object" ref="415440149"/> - <reference key="parent" ref="244177936"/> + <int key="objectID">502</int> + <reference key="object" ref="99609113"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="656413452"/> + </object> + <reference key="parent" ref="749294230"/> </object> <object class="IBObjectRecord"> - <int key="objectID">471</int> - <reference key="object" ref="48807148"/> - <reference key="parent" ref="244177936"/> + <int key="objectID">503</int> + <reference key="object" ref="656413452"/> + <reference key="parent" ref="99609113"/> </object> <object class="IBObjectRecord"> - <int key="objectID">472</int> - <reference key="object" ref="778334623"/> - <reference key="parent" ref="244177936"/> + <int key="objectID">497</int> + <reference key="object" ref="891828782"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1024441020"/> + <reference ref="1034669272"/> + <reference ref="505033846"/> + <reference ref="399860348"/> + <reference ref="25085450"/> + <reference ref="968858508"/> + <reference ref="690079652"/> + </object> + <reference key="parent" ref="299901009"/> </object> <object class="IBObjectRecord"> - <int key="objectID">473</int> - <reference key="object" ref="299901009"/> + <int key="objectID">509</int> + <reference key="object" ref="1024441020"/> + <reference key="parent" ref="891828782"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">506</int> + <reference key="object" ref="1034669272"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="839200213"/> + <reference ref="2554196"/> </object> - <reference key="parent" ref="649796088"/> + <reference key="parent" ref="891828782"/> </object> <object class="IBObjectRecord"> - <int key="objectID">474</int> - <reference key="object" ref="839200213"/> + <int key="objectID">507</int> + <reference key="object" ref="2554196"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="525431043"/> - <reference ref="369386365"/> - <reference ref="337321076"/> - <reference ref="574125256"/> - <reference ref="720866399"/> + <reference ref="963150272"/> </object> - <reference key="parent" ref="299901009"/> + <reference key="parent" ref="1034669272"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">508</int> + <reference key="object" ref="963150272"/> + <reference key="parent" ref="2554196"/> </object> <object class="IBObjectRecord"> - <int key="objectID">475</int> - <reference key="object" ref="525431043"/> - <reference key="parent" ref="839200213"/> + <int key="objectID">505</int> + <reference key="object" ref="505033846"/> + <reference key="parent" ref="891828782"/> </object> <object class="IBObjectRecord"> - <int key="objectID">476</int> - <reference key="object" ref="369386365"/> - <reference key="parent" ref="839200213"/> + <int key="objectID">504</int> + <reference key="object" ref="399860348"/> + <reference key="parent" ref="891828782"/> </object> <object class="IBObjectRecord"> - <int key="objectID">477</int> - <reference key="object" ref="337321076"/> + <int key="objectID">500</int> + <reference key="object" ref="25085450"/> + <reference key="parent" ref="891828782"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">499</int> + <reference key="object" ref="968858508"/> + <reference key="parent" ref="891828782"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">498</int> + <reference key="object" ref="690079652"/> + <reference key="parent" ref="891828782"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">514</int> + <reference key="object" ref="445514911"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="245976667"/> + <reference ref="436720301"/> </object> - <reference key="parent" ref="839200213"/> + <reference key="parent" ref="649796088"/> </object> <object class="IBObjectRecord"> - <int key="objectID">478</int> - <reference key="object" ref="245976667"/> + <int key="objectID">515</int> + <reference key="object" ref="436720301"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="581498012"/> + <reference ref="1072249258"/> + <reference ref="912432543"/> + <reference ref="168518061"/> + <reference ref="397370115"/> + <reference ref="792145602"/> </object> - <reference key="parent" ref="337321076"/> + <reference key="parent" ref="445514911"/> </object> <object class="IBObjectRecord"> - <int key="objectID">479</int> - <reference key="object" ref="581498012"/> - <reference key="parent" ref="245976667"/> + <int key="objectID">516</int> + <reference key="object" ref="1072249258"/> + <reference key="parent" ref="436720301"/> </object> <object class="IBObjectRecord"> - <int key="objectID">480</int> - <reference key="object" ref="574125256"/> - <reference key="parent" ref="839200213"/> + <int key="objectID">518</int> + <reference key="object" ref="912432543"/> + <reference key="parent" ref="436720301"/> </object> <object class="IBObjectRecord"> - <int key="objectID">481</int> - <reference key="object" ref="720866399"/> - <reference key="parent" ref="839200213"/> + <int key="objectID">519</int> + <reference key="object" ref="168518061"/> + <reference key="parent" ref="436720301"/> </object> <object class="IBObjectRecord"> - <int key="objectID">483</int> - <reference key="object" ref="168151378"/> - <reference key="parent" ref="1049"/> + <int key="objectID">520</int> + <reference key="object" ref="397370115"/> + <reference key="parent" ref="436720301"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">521</int> + <reference key="object" ref="792145602"/> + <reference key="parent" ref="436720301"/> </object> </object> </object> @@ -2153,7 +2341,6 @@ <string>296.IBPluginDependency</string> <string>296.editorWindowContentRectSynchronizationRect</string> <string>297.IBPluginDependency</string> - <string>298.IBPluginDependency</string> <string>346.IBPluginDependency</string> <string>346.ImportedFromIB2</string> <string>348.IBPluginDependency</string> @@ -2181,33 +2368,45 @@ <string>458.IBPluginDependency</string> <string>459.IBPluginDependency</string> <string>460.IBPluginDependency</string> - <string>461.IBPluginDependency</string> <string>462.IBPluginDependency</string> - <string>464.IBPluginDependency</string> <string>465.IBPluginDependency</string> <string>466.IBEditorWindowLastContentRect</string> <string>466.IBPluginDependency</string> <string>467.IBPluginDependency</string> - <string>468.IBPluginDependency</string> - <string>469.IBEditorWindowLastContentRect</string> - <string>469.IBPluginDependency</string> - <string>470.IBPluginDependency</string> - <string>471.IBPluginDependency</string> - <string>472.IBPluginDependency</string> <string>473.IBPluginDependency</string> - <string>474.IBEditorWindowLastContentRect</string> - <string>474.IBPluginDependency</string> - <string>475.IBPluginDependency</string> - <string>476.IBPluginDependency</string> - <string>477.IBPluginDependency</string> - <string>478.IBEditorWindowLastContentRect</string> - <string>478.IBPluginDependency</string> - <string>479.IBPluginDependency</string> - <string>480.IBPluginDependency</string> - <string>481.IBPluginDependency</string> <string>483.IBPluginDependency</string> + <string>491.IBPluginDependency</string> + <string>492.IBPluginDependency</string> + <string>493.IBPluginDependency</string> + <string>494.IBPluginDependency</string> + <string>495.IBPluginDependency</string> + <string>496.IBPluginDependency</string> + <string>497.IBEditorWindowLastContentRect</string> + <string>497.IBPluginDependency</string> + <string>498.IBPluginDependency</string> + <string>499.IBPluginDependency</string> <string>5.IBPluginDependency</string> <string>5.ImportedFromIB2</string> + <string>500.IBPluginDependency</string> + <string>501.IBPluginDependency</string> + <string>502.IBEditorWindowLastContentRect</string> + <string>502.IBPluginDependency</string> + <string>503.IBPluginDependency</string> + <string>504.IBPluginDependency</string> + <string>505.IBPluginDependency</string> + <string>506.IBPluginDependency</string> + <string>507.IBEditorWindowLastContentRect</string> + <string>507.IBPluginDependency</string> + <string>508.IBPluginDependency</string> + <string>509.IBPluginDependency</string> + <string>514.IBPluginDependency</string> + <string>515.IBEditorWindowLastContentRect</string> + <string>515.IBPluginDependency</string> + <string>516.IBPluginDependency</string> + <string>518.IBPluginDependency</string> + <string>519.IBPluginDependency</string> + <string>520.IBPluginDependency</string> + <string>521.IBPluginDependency</string> <string>56.IBPluginDependency</string> <string>56.ImportedFromIB2</string> <string>57.IBEditorWindowLastContentRect</string> @@ -2248,7 +2447,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1" id="9"/> - <string>{{575, 723}, {181, 23}}</string> + <string>{{507, 724}, {181, 23}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{596, 852}, {216, 23}}</string> @@ -2256,7 +2455,7 @@ <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{617, 609}, {132, 23}}</string> + <string>{{456, 643}, {132, 23}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{522, 812}, {146, 23}}</string> @@ -2308,7 +2507,7 @@ <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{287, 503}, {243, 243}}</string> + <string>{{249, 483}, {243, 263}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{197, 734}, {243, 243}}</string> @@ -2342,7 +2541,7 @@ <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{530, 483}, {241, 103}}</string> + <string>{{492, 463}, {241, 103}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{608, 612}, {241, 103}}</string> @@ -2354,22 +2553,21 @@ <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{381, 613}, {213, 133}}</string> + <string>{{502, 616}, {213, 133}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{525, 802}, {197, 73}}</string> - <string>{{101, 746}, {535, 20}}</string> + <string>{{99, 749}, {535, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{74, 862}</string> <string>{{11, 977}, {478, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{331, 573}, {237, 173}}</string> + <string>{{291, 606}, {273, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{475, 832}, {234, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> @@ -2398,34 +2596,46 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{568, 573}, {178, 23}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{568, 573}, {178, 23}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{293, 683}, {110, 63}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{360, 663}, {336, 83}}</string> + <string>{{408, 626}, {230, 123}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{600, 693}, {86, 23}}</string> + <reference ref="9"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{566, 604}, {137, 23}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{572, 694}, {86, 23}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{341, 656}, {188, 93}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{113, 563}, {210, 183}}</string> + <string>{{113, 533}, {244, 213}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{23, 794}, {245, 183}}</string> @@ -2445,7 +2655,7 @@ <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{207, 513}, {229, 233}}</string> + <string>{{205, 466}, {249, 283}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{323, 672}, {199, 203}}</string> @@ -2477,7 +2687,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">490</int> + <int key="maxID">526</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -2496,6 +2706,7 @@ </object> <object class="IBPartialClassDescription"> <string key="className">FirstResponder</string> + <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> <string key="NS.key.0">commandDispatch:</string> <string key="NS.object.0">id</string> diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 01638dc..d7de49e 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -79,12 +79,16 @@ case IDC_NEW_WINDOW: Browser::OpenEmptyWindow(ProfileManager::FakeProfile()); break; + case IDC_NEW_INCOGNITO_WINDOW: + Browser::OpenURLOffTheRecord(ProfileManager::FakeProfile(), GURL()); + break; }; } - (void)initMenuState { menuState_ = new CommandUpdater(NULL); menuState_->UpdateCommandEnabled(IDC_NEW_WINDOW, true); + menuState_->UpdateCommandEnabled(IDC_NEW_INCOGNITO_WINDOW, true); // TODO(pinkerton): ...more to come... } |