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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1105143005: Issue 465302:System wide share options on Mac Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added unit tests, honored Cocoa memory management issues Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/app_controller_mac.h » ('j') | chrome/browser/app_controller_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/nibs/MainMenu.xib
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib
index 8419d712b8fc779a8d457f7bfadb444ad5463bb0..51ed28880c6c79018e0dd2622866d109437e1aba 100644
--- a/chrome/app/nibs/MainMenu.xib
+++ b/chrome/app/nibs/MainMenu.xib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">12F37</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.39</string>
- <string key="IBDocument.HIToolboxVersion">626.00</string>
+ <string key="IBDocument.SystemVersion">14A389</string>
+ <string key="IBDocument.InterfaceBuilderVersion">7702</string>
+ <string key="IBDocument.AppKitVersion">1343.14</string>
+ <string key="IBDocument.HIToolboxVersion">755.00</string>
Avi (use Gerrit) 2015/05/15 16:13:08 Please read https://www.chromium.org/developers/de
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">3084</string>
+ <string key="NS.object.0">7702</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSCustomObject</string>
@@ -53,6 +53,7 @@
</object>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">44002</int>
+ <reference key="NSTarget" ref="219856472"/>
<object class="NSMenu" key="NSSubmenu" id="219856472">
<string key="NSTitle">^IDS_APP_MENU_PRODUCT_NAME</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -142,6 +143,7 @@
<reference key="NSOnImage" ref="657443692"/>
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
+ <reference key="NSTarget" ref="532337997"/>
<object class="NSMenu" key="NSSubmenu" id="532337997">
<string key="NSTitle">^IDS_SERVICES_MAC</string>
<array class="NSMutableArray" key="NSMenuItems"/>
@@ -244,6 +246,7 @@
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">44001</int>
+ <reference key="NSTarget" ref="682100697"/>
<object class="NSMenu" key="NSSubmenu" id="682100697">
<string key="NSTitle">^IDS_FILE_MENU_MAC</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -356,16 +359,6 @@
<reference key="NSOnImage" ref="657443692"/>
<reference key="NSMixedImage" ref="5855623"/>
</object>
- <object class="NSMenuItem" id="267787625">
- <reference key="NSMenu" ref="682100697"/>
- <string key="NSTitle">^IDS_EMAIL_PAGE_LOCATION_MAC</string>
- <string key="NSKeyEquiv">I</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="657443692"/>
- <reference key="NSMixedImage" ref="5855623"/>
- <int key="NSTag">35006</int>
- </object>
<object class="NSMenuItem" id="214594368">
<reference key="NSMenu" ref="682100697"/>
<bool key="NSIsDisabled">YES</bool>
@@ -409,6 +402,7 @@
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">36004</int>
+ <reference key="NSTarget" ref="586765401"/>
<object class="NSMenu" key="NSSubmenu" id="586765401">
<string key="NSTitle">^IDS_EDIT_MENU_MAC</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -530,6 +524,7 @@
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">37100</int>
+ <reference key="NSTarget" ref="471573355"/>
<object class="NSMenu" key="NSSubmenu" id="471573355">
<string key="NSTitle">^IDS_EDIT_FIND_SUBMENU_MAC</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -613,6 +608,7 @@
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">41005</int>
+ <reference key="NSTarget" ref="559044683"/>
<object class="NSMenu" key="NSSubmenu" id="559044683">
<string key="NSTitle">^IDS_EDIT_SPELLING_GRAMMAR_MAC</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -662,6 +658,7 @@
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">50158</int>
+ <reference key="NSTarget" ref="911650876"/>
<object class="NSMenu" key="NSSubmenu" id="911650876">
<string key="NSTitle">^IDS_SPEECH_MAC</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -696,6 +693,7 @@
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">44000</int>
+ <reference key="NSTarget" ref="1040042444"/>
<object class="NSMenu" key="NSSubmenu" id="1040042444">
<string key="NSTitle">^IDS_VIEW_MENU_MAC</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -829,6 +827,7 @@
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">35005</int>
+ <reference key="NSTarget" ref="26233896"/>
<object class="NSMenu" key="NSSubmenu" id="26233896">
<string key="NSTitle">^IDS_ENCODING_MENU</string>
<array class="NSMutableArray" key="NSMenuItems"/>
@@ -842,6 +841,7 @@
<reference key="NSOnImage" ref="657443692"/>
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
+ <reference key="NSTarget" ref="311944614"/>
<object class="NSMenu" key="NSSubmenu" id="311944614">
<string key="NSTitle">^IDS_DEVELOPER_MENU_MAC</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -890,6 +890,7 @@
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">46000</int>
+ <reference key="NSTarget" ref="623327365"/>
<object class="NSMenu" key="NSSubmenu" id="623327365">
<string key="NSTitle">^IDS_HISTORY_MENU_MAC</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -998,6 +999,7 @@
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">40029</int>
+ <reference key="NSTarget" ref="829629475"/>
<object class="NSMenu" key="NSSubmenu" id="829629475">
<string key="NSTitle">^IDS_BOOKMARKS_MENU</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -1074,6 +1076,7 @@
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
<int key="NSTag">34045</int>
+ <reference key="NSTarget" ref="288203421"/>
<object class="NSMenu" key="NSSubmenu" id="288203421">
<string key="NSTitle">^IDS_WINDOW_MENU_MAC</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -1205,6 +1208,7 @@
<reference key="NSOnImage" ref="657443692"/>
<reference key="NSMixedImage" ref="5855623"/>
<string key="NSAction">submenuAction:</string>
+ <reference key="NSTarget" ref="48684406"/>
<object class="NSMenu" key="NSSubmenu" id="48684406">
<string key="NSTitle">^IDS_HELP_MENU_MAC</string>
<array class="NSMutableArray" key="NSMenuItems">
@@ -1242,7 +1246,7 @@
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<bool key="usesAutoincrementingIDs">NO</bool>
- <array class="NSMutableArray" key="connectionRecords">
+ <array key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
@@ -1383,14 +1387,6 @@
<object class="IBActionConnection" key="connection">
<string key="label">commandDispatch:</string>
<reference key="source" ref="653827613"/>
- <reference key="destination" ref="267787625"/>
- </object>
- <string key="id">668</string>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">commandDispatch:</string>
- <reference key="source" ref="653827613"/>
<reference key="destination" ref="254225349"/>
</object>
<string key="id">645</string>
@@ -2070,7 +2066,6 @@
<reference ref="645868475"/>
<reference ref="797184652"/>
<reference ref="788073054"/>
- <reference ref="267787625"/>
<reference ref="214594368"/>
<reference ref="254225349"/>
<reference ref="310206231"/>
@@ -2128,21 +2123,6 @@
<reference key="parent" ref="682100697"/>
</object>
<object class="IBObjectRecord">
- <string key="id">452</string>
- <reference key="object" ref="788073054"/>
- <reference key="parent" ref="682100697"/>
- </object>
- <object class="IBObjectRecord">
- <string key="id">451</string>
- <reference key="object" ref="267787625"/>
- <reference key="parent" ref="682100697"/>
- </object>
- <object class="IBObjectRecord">
- <string key="id">74</string>
- <reference key="object" ref="214594368"/>
- <reference key="parent" ref="682100697"/>
- </object>
- <object class="IBObjectRecord">
<string key="id">78</string>
<reference key="object" ref="254225349"/>
<reference key="parent" ref="682100697"/>
@@ -2737,6 +2717,16 @@
<reference key="object" ref="147583806"/>
<reference key="parent" ref="0"/>
</object>
+ <object class="IBObjectRecord">
+ <string key="id">452</string>
+ <reference key="object" ref="788073054"/>
+ <reference key="parent" ref="682100697"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">74</string>
+ <reference key="object" ref="214594368"/>
+ <reference key="parent" ref="682100697"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -2844,8 +2834,6 @@
<boolean value="NO" key="449.showNotes"/>
<string key="450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="450.showNotes"/>
- <string key="451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="NO" key="451.showNotes"/>
<string key="452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="452.showNotes"/>
<string key="453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3019,76 +3007,90 @@
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<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">./Classes/ChromeUILocalizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">GTMUILocalizer</string>
+ <string key="className">AppController</string>
<string key="superclassName">NSObject</string>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="otherObjectToLocalize">id</string>
- <string key="otherObjectToLocalize_">id</string>
- <string key="owner">id</string>
- <string key="owner_">id</string>
- <string key="yetAnotherObjectToLocalize">id</string>
- <string key="yetAnotherObjectToLocalize_">id</string>
+ <dictionary class="NSMutableDictionary" key="actions">
+ <string key="orderFrontStandardAboutPanel:">id</string>
+ <string key="showPreferences:">id</string>
+ <string key="toggleConfirmToQuit:">id</string>
+ <string key="toggleDisplayMessageCenter:">id</string>
</dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="otherObjectToLocalize">
- <string key="name">otherObjectToLocalize</string>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="orderFrontStandardAboutPanel:">
+ <string key="name">orderFrontStandardAboutPanel:</string>
<string key="candidateClassName">id</string>
</object>
- <object class="IBToOneOutletInfo" key="otherObjectToLocalize_">
- <string key="name">otherObjectToLocalize_</string>
+ <object class="IBActionInfo" key="showPreferences:">
+ <string key="name">showPreferences:</string>
<string key="candidateClassName">id</string>
</object>
- <object class="IBToOneOutletInfo" key="owner">
- <string key="name">owner</string>
+ <object class="IBActionInfo" key="toggleConfirmToQuit:">
+ <string key="name">toggleConfirmToQuit:</string>
<string key="candidateClassName">id</string>
</object>
- <object class="IBToOneOutletInfo" key="owner_">
- <string key="name">owner_</string>
+ <object class="IBActionInfo" key="toggleDisplayMessageCenter:">
+ <string key="name">toggleDisplayMessageCenter:</string>
<string key="candidateClassName">id</string>
</object>
- <object class="IBToOneOutletInfo" key="yetAnotherObjectToLocalize">
- <string key="name">yetAnotherObjectToLocalize</string>
- <string key="candidateClassName">id</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="closeTabMenuItem_">NSMenuItem</string>
+ <string key="closeWindowMenuItem_">NSMenuItem</string>
+ <string key="helpMenu_">NSMenu</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="closeTabMenuItem_">
+ <string key="name">closeTabMenuItem_</string>
+ <string key="candidateClassName">NSMenuItem</string>
</object>
- <object class="IBToOneOutletInfo" key="yetAnotherObjectToLocalize_">
- <string key="name">yetAnotherObjectToLocalize_</string>
- <string key="candidateClassName">id</string>
+ <object class="IBToOneOutletInfo" key="closeWindowMenuItem_">
+ <string key="name">closeWindowMenuItem_</string>
+ <string key="candidateClassName">NSMenuItem</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="helpMenu_">
+ <string key="name">helpMenu_</string>
+ <string key="candidateClassName">NSMenu</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/GTMUILocalizer.h</string>
+ <string key="minorKey">../../chrome/browser/app_controller_mac.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">BrowserCrApplication</string>
+ <string key="superclassName">NSApplication</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../../chrome/browser/chrome_browser_application_mac.h</string>
+ </object>
+ </object>
+ <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">../../chrome/browser/ui/cocoa/ui_localizer.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1050" key="NS.object.0"/>
</object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1060" key="NS.object.0"/>
- </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <real value="4500" key="NS.object.0"/>
+ <integer value="4600" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <string key="NSMenuCheckmark">{11, 11}</string>
- <string key="NSMenuMixedState">{10, 3}</string>
+ <string key="NSMenuCheckmark">{12, 12}</string>
+ <string key="NSMenuMixedState">{10, 2}</string>
</dictionary>
</data>
</archive>
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/app_controller_mac.h » ('j') | chrome/browser/app_controller_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698