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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/nibs/MainMenu.xib

Issue 434073: Complete the merge of 32526.... (Closed) Base URL: svn://chrome-svn/chrome/branches/249/src/
Patch Set: '' Created 11 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/app/nibs/Toolbar.xib » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/nibs/MainMenu.xib
===================================================================
--- chrome/app/nibs/MainMenu.xib (revision 33055)
+++ chrome/app/nibs/MainMenu.xib (working copy)
@@ -8,6 +8,7 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="57"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -104,6 +105,15 @@
<reference key="NSMixedImage" ref="549394948"/>
<int key="NSTag">40013</int>
</object>
+ <object class="NSMenuItem" id="198763083">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">^IDS_IMPORT_SETTINGS_TITLE</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ <int key="NSTag">40014</int>
+ </object>
<object class="NSMenuItem" id="481834944">
<reference key="NSMenu" ref="110575045"/>
<bool key="NSIsDisabled">YES</bool>
@@ -1596,13 +1606,21 @@
</object>
<int key="connectionID">659</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">commandDispatch:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="198763083"/>
+ </object>
+ <int key="connectionID">663</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>
- <object class="NSArray" key="object" id="1000888685">
+ <object class="NSArray" key="object" id="953662269">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="children" ref="1048"/>
@@ -1611,19 +1629,19 @@
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="1021"/>
- <reference key="parent" ref="1000888685"/>
+ <reference key="parent" ref="953662269"/>
<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="1014"/>
- <reference key="parent" ref="1000888685"/>
+ <reference key="parent" ref="953662269"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="1050"/>
- <reference key="parent" ref="1000888685"/>
+ <reference key="parent" ref="953662269"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
@@ -1640,7 +1658,7 @@
<reference ref="586577488"/>
<reference ref="445514911"/>
</object>
- <reference key="parent" ref="1000888685"/>
+ <reference key="parent" ref="953662269"/>
<string key="objectName">Main Menu</string>
</object>
<object class="IBObjectRecord">
@@ -1930,6 +1948,8 @@
<reference ref="446911629"/>
<reference ref="481834944"/>
<reference ref="52470633"/>
+ <reference ref="198763083"/>
+ <reference ref="198763083"/>
</object>
<reference key="parent" ref="694149608"/>
</object>
@@ -2072,7 +2092,7 @@
<object class="IBObjectRecord">
<int key="objectID">373</int>
<reference key="object" ref="163992474"/>
- <reference key="parent" ref="1000888685"/>
+ <reference key="parent" ref="953662269"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">449</int>
@@ -2163,7 +2183,7 @@
<object class="IBObjectRecord">
<int key="objectID">483</int>
<reference key="object" ref="168151378"/>
- <reference key="parent" ref="1000888685"/>
+ <reference key="parent" ref="953662269"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">492</int>
@@ -2376,7 +2396,7 @@
<object class="IBObjectRecord">
<int key="objectID">641</int>
<reference key="object" ref="979722531"/>
- <reference key="parent" ref="1000888685"/>
+ <reference key="parent" ref="953662269"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">648</int>
@@ -2403,6 +2423,11 @@
<reference key="object" ref="688066565"/>
<reference key="parent" ref="789758025"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">662</int>
+ <reference key="object" ref="198763083"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2590,6 +2615,8 @@
<string>656.IBPluginDependency</string>
<string>658.IBPluginDependency</string>
<string>658.ImportedFromIB2</string>
+ <string>660.IBPluginDependency</string>
+ <string>662.IBShouldRemoveOnLegacySave</string>
<string>72.IBPluginDependency</string>
<string>72.ImportedFromIB2</string>
<string>73.IBPluginDependency</string>
@@ -2710,11 +2737,11 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{1190, 174}, {323, 163}}</string>
+ <string>{{1382, 97}, {323, 183}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{525, 802}, {197, 73}}</string>
- <string>{{199, 280}, {1578, 20}}</string>
+ <string>{{38, 600}, {1578, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{74, 862}</string>
@@ -2779,7 +2806,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{42, 196}, {382, 213}}</string>
+ <string>{{50, 367}, {385, 233}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{23, 794}, {245, 183}}</string>
@@ -2799,6 +2826,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="YES"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
@@ -2812,7 +2841,7 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{160, 20}, {353, 303}}</string>
+ <string>{{305, 468}, {353, 303}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{323, 672}, {199, 203}}</string>
@@ -2844,7 +2873,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">659</int>
+ <int key="maxID">663</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
« no previous file with comments | « no previous file | chrome/app/nibs/Toolbar.xib » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698