Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(572)

Side by Side Diff: chrome/app/nibs/Toolbar.xib

Issue 251091: Mac: Eliminate unintended "menu" method overrides. (Closed)
Patch Set: Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/nibs/BookmarkBar.xib ('k') | chrome/browser/cocoa/back_forward_menu_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> 2 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
3 <data> 3 <data>
4 <int key="IBDocument.SystemTarget">1050</int> 4 <int key="IBDocument.SystemTarget">1050</int>
5 <string key="IBDocument.SystemVersion">9L31a</string> 5 <string key="IBDocument.SystemVersion">9L31a</string>
6 <string key="IBDocument.InterfaceBuilderVersion">677</string> 6 <string key="IBDocument.InterfaceBuilderVersion">677</string>
7 <string key="IBDocument.AppKitVersion">949.54</string> 7 <string key="IBDocument.AppKitVersion">949.54</string>
8 <string key="IBDocument.HIToolboxVersion">353.00</string> 8 <string key="IBDocument.HIToolboxVersion">353.00</string>
9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
10 <bool key="EncodedWithXMLCoder">YES</bool> 10 <bool key="EncodedWithXMLCoder">YES</bool>
11 <integer value="48"/>
12 <integer value="67"/>
11 <integer value="1"/> 13 <integer value="1"/>
12 <integer value="67"/>
13 <integer value="48"/>
14 </object> 14 </object>
15 <object class="NSArray" key="IBDocument.PluginDependencies"> 15 <object class="NSArray" key="IBDocument.PluginDependencies">
16 <bool key="EncodedWithXMLCoder">YES</bool> 16 <bool key="EncodedWithXMLCoder">YES</bool>
17 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 17 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
18 </object> 18 </object>
19 <object class="NSMutableDictionary" key="IBDocument.Metadata"> 19 <object class="NSMutableDictionary" key="IBDocument.Metadata">
20 <bool key="EncodedWithXMLCoder">YES</bool> 20 <bool key="EncodedWithXMLCoder">YES</bool>
21 <object class="NSArray" key="dict.sortedKeys"> 21 <object class="NSArray" key="dict.sortedKeys">
22 <bool key="EncodedWithXMLCoder">YES</bool> 22 <bool key="EncodedWithXMLCoder">YES</bool>
23 </object> 23 </object>
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 </object> 242 </object>
243 </object> 243 </object>
244 <object class="NSButton" id="571076484"> 244 <object class="NSButton" id="571076484">
245 <reference key="NSNextResponder" ref="928520650"/> 245 <reference key="NSNextResponder" ref="928520650"/>
246 <int key="NSvFlags">265</int> 246 <int key="NSvFlags">265</int>
247 <string key="NSFrame">{{540, 5}, {35, 27}}</string> 247 <string key="NSFrame">{{540, 5}, {35, 27}}</string>
248 <reference key="NSSuperview" ref ="928520650"/> 248 <reference key="NSSuperview" ref ="928520650"/>
249 <int key="NSTag">33005</int> 249 <int key="NSTag">33005</int>
250 <bool key="NSEnabled">YES</bool> 250 <bool key="NSEnabled">YES</bool>
251 <object class="NSButtonCell" key ="NSCell" id="482050975"> 251 <object class="NSButtonCell" key ="NSCell" id="482050975">
252 » » » » » » » <int key="NSCellFlags">6 7239424</int> 252 » » » » » » » <int key="NSCellFlags">- 2080244224</int>
253 <int key="NSCellFlags2"> 134250496</int> 253 <int key="NSCellFlags2"> 134250496</int>
254 <string key="NSContents" /> 254 <string key="NSContents" />
255 <reference key="NSSuppor t" ref="64724822"/> 255 <reference key="NSSuppor t" ref="64724822"/>
256 <int key="NSTag">-2</int > 256 <int key="NSTag">-2</int >
257 <reference key="NSContro lView" ref="571076484"/> 257 <reference key="NSContro lView" ref="571076484"/>
258 <int key="NSButtonFlags" >149700863</int> 258 <int key="NSButtonFlags" >149700863</int>
259 <int key="NSButtonFlags2 ">134</int> 259 <int key="NSButtonFlags2 ">134</int>
260 <object class="NSCustomR esource" key="NSNormalImage"> 260 <object class="NSCustomR esource" key="NSNormalImage">
261 <string key="NSC lassName">NSImage</string> 261 <string key="NSC lassName">NSImage</string>
262 <string key="NSR esourceName">menu_page_Template</string> 262 <string key="NSR esourceName">menu_page_Template</string>
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
1004 <object class="IBConnectionRecord"> 1004 <object class="IBConnectionRecord">
1005 <object class="IBOutletConnection" key=" connection"> 1005 <object class="IBOutletConnection" key=" connection">
1006 <string key="label">otherObjectT oLocalize_</string> 1006 <string key="label">otherObjectT oLocalize_</string>
1007 <reference key="source" ref="104 4322163"/> 1007 <reference key="source" ref="104 4322163"/>
1008 <reference key="destination" ref ="558188039"/> 1008 <reference key="destination" ref ="558188039"/>
1009 </object> 1009 </object>
1010 <int key="connectionID">124</int> 1010 <int key="connectionID">124</int>
1011 </object> 1011 </object>
1012 <object class="IBConnectionRecord"> 1012 <object class="IBConnectionRecord">
1013 <object class="IBOutletConnection" key=" connection"> 1013 <object class="IBOutletConnection" key=" connection">
1014 <string key="label">menu_</strin g>
1015 <reference key="source" ref="571 076484"/>
1016 <reference key="destination" ref ="1035953805"/>
1017 </object>
1018 <int key="connectionID">125</int>
1019 </object>
1020 <object class="IBConnectionRecord">
1021 <object class="IBOutletConnection" key=" connection">
1022 <string key="label">menu_</strin g>
1023 <reference key="source" ref="602 421009"/>
1024 <reference key="destination" ref ="558188039"/>
1025 </object>
1026 <int key="connectionID">126</int>
1027 </object>
1028 <object class="IBConnectionRecord">
1029 <object class="IBOutletConnection" key=" connection">
1030 <string key="label">encodingMenu _</string> 1014 <string key="label">encodingMenu _</string>
1031 <reference key="source" ref="100 1"/> 1015 <reference key="source" ref="100 1"/>
1032 <reference key="destination" ref ="1054137046"/> 1016 <reference key="destination" ref ="1054137046"/>
1033 </object> 1017 </object>
1034 <int key="connectionID">134</int> 1018 <int key="connectionID">134</int>
1035 </object> 1019 </object>
1020 <object class="IBConnectionRecord">
1021 <object class="IBOutletConnection" key=" connection">
1022 <string key="label">attachedMenu _</string>
1023 <reference key="source" ref="571 076484"/>
1024 <reference key="destination" ref ="1035953805"/>
1025 </object>
1026 <int key="connectionID">135</int>
1027 </object>
1028 <object class="IBConnectionRecord">
1029 <object class="IBOutletConnection" key=" connection">
1030 <string key="label">attachedMenu _</string>
1031 <reference key="source" ref="602 421009"/>
1032 <reference key="destination" ref ="558188039"/>
1033 </object>
1034 <int key="connectionID">136</int>
1035 </object>
1036 </object> 1036 </object>
1037 <object class="IBMutableOrderedSet" key="objectRecords"> 1037 <object class="IBMutableOrderedSet" key="objectRecords">
1038 <object class="NSArray" key="orderedObjects"> 1038 <object class="NSArray" key="orderedObjects">
1039 <bool key="EncodedWithXMLCoder">YES</boo l> 1039 <bool key="EncodedWithXMLCoder">YES</boo l>
1040 <object class="IBObjectRecord"> 1040 <object class="IBObjectRecord">
1041 <int key="objectID">0</int> 1041 <int key="objectID">0</int>
1042 <object class="NSArray" key="obj ect" id="701738477"> 1042 <object class="NSArray" key="obj ect" id="701738477">
1043 <bool key="EncodedWithXM LCoder">YES</bool> 1043 <bool key="EncodedWithXM LCoder">YES</bool>
1044 </object> 1044 </object>
1045 <reference key="children" ref="1 000"/> 1045 <reference key="children" ref="1 000"/>
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after
1742 <object class="NSMutableDictionary" key="localizations"> 1742 <object class="NSMutableDictionary" key="localizations">
1743 <bool key="EncodedWithXMLCoder">YES</bool> 1743 <bool key="EncodedWithXMLCoder">YES</bool>
1744 <object class="NSArray" key="dict.sortedKeys"> 1744 <object class="NSArray" key="dict.sortedKeys">
1745 <bool key="EncodedWithXMLCoder">YES</boo l> 1745 <bool key="EncodedWithXMLCoder">YES</boo l>
1746 </object> 1746 </object>
1747 <object class="NSMutableArray" key="dict.values" > 1747 <object class="NSMutableArray" key="dict.values" >
1748 <bool key="EncodedWithXMLCoder">YES</boo l> 1748 <bool key="EncodedWithXMLCoder">YES</boo l>
1749 </object> 1749 </object>
1750 </object> 1750 </object>
1751 <nil key="sourceID"/> 1751 <nil key="sourceID"/>
1752 » » » <int key="maxID">134</int> 1752 » » » <int key="maxID">136</int>
1753 </object> 1753 </object>
1754 <object class="IBClassDescriber" key="IBDocument.Classes"> 1754 <object class="IBClassDescriber" key="IBDocument.Classes">
1755 <object class="NSMutableArray" key="referencedPartialCla ssDescriptions"> 1755 <object class="NSMutableArray" key="referencedPartialCla ssDescriptions">
1756 <bool key="EncodedWithXMLCoder">YES</bool> 1756 <bool key="EncodedWithXMLCoder">YES</bool>
1757 <object class="IBPartialClassDescription"> 1757 <object class="IBPartialClassDescription">
1758 <string key="className">AppController</s tring> 1758 <string key="className">AppController</s tring>
1759 <string key="superclassName">NSObject</s tring> 1759 <string key="superclassName">NSObject</s tring>
1760 <object class="NSMutableDictionary" key= "actions"> 1760 <object class="NSMutableDictionary" key= "actions">
1761 <bool key="EncodedWithXMLCoder"> YES</bool> 1761 <bool key="EncodedWithXMLCoder"> YES</bool>
1762 <object class="NSMutableArray" k ey="dict.sortedKeys"> 1762 <object class="NSMutableArray" k ey="dict.sortedKeys">
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1880 <string key="superclassName">NSButtonCel l</string> 1880 <string key="superclassName">NSButtonCel l</string>
1881 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1881 <object class="IBClassDescriptionSource" key="sourceIdentifier">
1882 <string key="majorKey">IBProject Source</string> 1882 <string key="majorKey">IBProject Source</string>
1883 <string key="minorKey">browser/c ocoa/gradient_button_cell.h</string> 1883 <string key="minorKey">browser/c ocoa/gradient_button_cell.h</string>
1884 </object> 1884 </object>
1885 </object> 1885 </object>
1886 <object class="IBPartialClassDescription"> 1886 <object class="IBPartialClassDescription">
1887 <string key="className">MenuButton</stri ng> 1887 <string key="className">MenuButton</stri ng>
1888 <string key="superclassName">NSButton</s tring> 1888 <string key="superclassName">NSButton</s tring>
1889 <object class="NSMutableDictionary" key= "outlets"> 1889 <object class="NSMutableDictionary" key= "outlets">
1890 » » » » » » <string key="NS.key.0">menu_</st ring> 1890 » » » » » » <string key="NS.key.0">attachedM enu_</string>
1891 <string key="NS.object.0">NSMenu </string> 1891 <string key="NS.object.0">NSMenu </string>
1892 </object> 1892 </object>
1893 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1893 <object class="IBClassDescriptionSource" key="sourceIdentifier">
1894 <string key="majorKey">IBProject Source</string> 1894 <string key="majorKey">IBProject Source</string>
1895 <string key="minorKey">browser/c ocoa/menu_button.h</string> 1895 <string key="minorKey">browser/c ocoa/menu_button.h</string>
1896 </object> 1896 </object>
1897 </object> 1897 </object>
1898 <object class="IBPartialClassDescription"> 1898 <object class="IBPartialClassDescription">
1899 <string key="className">NSObject</string > 1899 <string key="className">NSObject</string >
1900 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1900 <object class="IBClassDescriptionSource" key="sourceIdentifier">
(...skipping 16 matching lines...) Expand all
1917 </object> 1917 </object>
1918 </object> 1918 </object>
1919 <object class="IBPartialClassDescription"> 1919 <object class="IBPartialClassDescription">
1920 <string key="className">PreferencesWindo wController</string> 1920 <string key="className">PreferencesWindo wController</string>
1921 <string key="superclassName">NSWindowCon troller</string> 1921 <string key="superclassName">NSWindowCon troller</string>
1922 <object class="NSMutableDictionary" key= "actions"> 1922 <object class="NSMutableDictionary" key= "actions">
1923 <bool key="EncodedWithXMLCoder"> YES</bool> 1923 <bool key="EncodedWithXMLCoder"> YES</bool>
1924 <object class="NSMutableArray" k ey="dict.sortedKeys"> 1924 <object class="NSMutableArray" k ey="dict.sortedKeys">
1925 <bool key="EncodedWithXM LCoder">YES</bool> 1925 <bool key="EncodedWithXM LCoder">YES</bool>
1926 <string>addHomepage:</st ring> 1926 <string>addHomepage:</st ring>
1927 <string>browseDownloadLo cation:</string>
1927 <string>clearData:</stri ng> 1928 <string>clearData:</stri ng>
1928 <string>importData:</str ing> 1929 <string>importData:</str ing>
1929 <string>makeDefaultBrows er:</string> 1930 <string>makeDefaultBrows er:</string>
1930 <string>manageSearchEngi nes:</string> 1931 <string>manageSearchEngi nes:</string>
1931 <string>removeSelectedHo mepages:</string> 1932 <string>removeSelectedHo mepages:</string>
1932 <string>resetThemeToDefa ult:</string> 1933 <string>resetThemeToDefa ult:</string>
1933 <string>showPreferences: </string> 1934 <string>showPreferences: </string>
1934 <string>showSavedPasswor ds:</string> 1935 <string>showSavedPasswor ds:</string>
1935 <string>themesGallery:</ string> 1936 <string>themesGallery:</ string>
1936 <string>useCurrentPagesA sHomepage:</string> 1937 <string>useCurrentPagesA sHomepage:</string>
1937 </object> 1938 </object>
1938 <object class="NSMutableArray" k ey="dict.values"> 1939 <object class="NSMutableArray" k ey="dict.values">
1939 <bool key="EncodedWithXM LCoder">YES</bool> 1940 <bool key="EncodedWithXM LCoder">YES</bool>
1940 <string>id</string> 1941 <string>id</string>
1941 <string>id</string> 1942 <string>id</string>
1942 <string>id</string> 1943 <string>id</string>
1943 <string>id</string> 1944 <string>id</string>
1944 <string>id</string> 1945 <string>id</string>
1945 <string>id</string> 1946 <string>id</string>
1946 <string>id</string> 1947 <string>id</string>
1947 <string>id</string> 1948 <string>id</string>
1948 <string>id</string> 1949 <string>id</string>
1949 <string>id</string> 1950 <string>id</string>
1950 <string>id</string> 1951 <string>id</string>
1952 <string>id</string>
1951 </object> 1953 </object>
1952 </object> 1954 </object>
1953 <object class="NSMutableDictionary" key= "outlets"> 1955 <object class="NSMutableDictionary" key= "outlets">
1954 <bool key="EncodedWithXMLCoder"> YES</bool> 1956 <bool key="EncodedWithXMLCoder"> YES</bool>
1955 <object class="NSMutableArray" k ey="dict.sortedKeys"> 1957 <object class="NSMutableArray" k ey="dict.sortedKeys">
1956 <bool key="EncodedWithXM LCoder">YES</bool> 1958 <bool key="EncodedWithXM LCoder">YES</bool>
1957 <string>advancedScroller _</string> 1959 <string>advancedScroller _</string>
1958 <string>advancedView_</s tring> 1960 <string>advancedView_</s tring>
1959 <string>customPagesArray Controller_</string> 1961 <string>customPagesArray Controller_</string>
1962 <string>downloadLocation Control_</string>
1960 <string>tabView_</string > 1963 <string>tabView_</string >
1961 </object> 1964 </object>
1962 <object class="NSMutableArray" k ey="dict.values"> 1965 <object class="NSMutableArray" k ey="dict.values">
1963 <bool key="EncodedWithXM LCoder">YES</bool> 1966 <bool key="EncodedWithXM LCoder">YES</bool>
1964 <string>NSScrollView</st ring> 1967 <string>NSScrollView</st ring>
1965 <string>NSView</string> 1968 <string>NSView</string>
1966 <string>NSArrayControlle r</string> 1969 <string>NSArrayControlle r</string>
1970 <string>NSPathControl</s tring>
1967 <string>NSTabView</strin g> 1971 <string>NSTabView</strin g>
1968 </object> 1972 </object>
1969 </object> 1973 </object>
1970 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1974 <object class="IBClassDescriptionSource" key="sourceIdentifier">
1971 <string key="majorKey">IBProject Source</string> 1975 <string key="majorKey">IBProject Source</string>
1972 <string key="minorKey">browser/c ocoa/preferences_window_controller.h</string> 1976 <string key="minorKey">browser/c ocoa/preferences_window_controller.h</string>
1973 </object> 1977 </object>
1974 </object> 1978 </object>
1975 <object class="IBPartialClassDescription"> 1979 <object class="IBPartialClassDescription">
1976 <string key="className">TabController</s tring> 1980 <string key="className">TabController</s tring>
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
2085 <string key="minorKey"/> 2089 <string key="minorKey"/>
2086 </object> 2090 </object>
2087 </object> 2091 </object>
2088 </object> 2092 </object>
2089 </object> 2093 </object>
2090 <int key="IBDocument.localizationMode">0</int> 2094 <int key="IBDocument.localizationMode">0</int>
2091 <string key="IBDocument.LastKnownRelativeProjectPath">../../chro me.xcodeproj</string> 2095 <string key="IBDocument.LastKnownRelativeProjectPath">../../chro me.xcodeproj</string>
2092 <int key="IBDocument.defaultPropertyAccessControl">3</int> 2096 <int key="IBDocument.defaultPropertyAccessControl">3</int>
2093 </data> 2097 </data>
2094 </archive> 2098 </archive>
OLDNEW
« no previous file with comments | « chrome/app/nibs/BookmarkBar.xib ('k') | chrome/browser/cocoa/back_forward_menu_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698