diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 19:52:46 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 19:52:46 +0000 |
| commit | 961a693913f9effd9b7eae0ab3d17dd899306188 (patch) | |
| tree | 209b9783167d4f7d453a452b5c017d3d17eb4f3e /chrome/app | |
| parent | 2e9c23f5c7049beead982ee0834b7e91395debee (diff) | |
| download | chromium_src-961a693913f9effd9b7eae0ab3d17dd899306188.zip chromium_src-961a693913f9effd9b7eae0ab3d17dd899306188.tar.gz chromium_src-961a693913f9effd9b7eae0ab3d17dd899306188.tar.bz2 | |
[Mac] Add the Profile menu to the main menubar.
This creates a ProfileMenuController that is owned by the AppController. It is
responsible for managing the menu and menu item title.
XIB changes:
* Add a new menu item with no submenu called Profile with tag
IDC_PROFILE_MAIN_MENU.
BUG=86179
TEST=With --multi-profiles, a Profile menu is displayed in the menubar.
Review URL: http://codereview.chromium.org/7331029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_command_ids.h | 1 | ||||
| -rw-r--r-- | chrome/app/nibs/MainMenu.xib | 33 |
2 files changed, 26 insertions, 8 deletions
diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h index e85d964..53a53f5 100644 --- a/chrome/app/chrome_command_ids.h +++ b/chrome/app/chrome_command_ids.h @@ -212,6 +212,7 @@ #define IDC_INTERNET_OPTIONS 45100 // ChromeOS only #define IDC_LANGUAGE_OPTIONS 45200 // ChromeOS only #define IDC_HISTORY_MENU 46000 // OSX only +#define IDC_PROFILE_MAIN_MENU 46100 // OSX only #define IDC_INPUT_METHODS_MENU 46300 // Linux only // Custom context menu entries diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib index ae55a8f..e76672a 100644 --- a/chrome/app/nibs/MainMenu.xib +++ b/chrome/app/nibs/MainMenu.xib @@ -2,17 +2,17 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10J567</string> - <string key="IBDocument.InterfaceBuilderVersion">788</string> + <string key="IBDocument.SystemVersion">10J869</string> + <string key="IBDocument.InterfaceBuilderVersion">851</string> <string key="IBDocument.AppKitVersion">1038.35</string> - <string key="IBDocument.HIToolboxVersion">462.00</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">851</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="205"/> + <integer value="29"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1161,6 +1161,15 @@ <string key="NSName">_NSWindowsMenu</string> </object> </object> + <object class="NSMenuItem" id="657848419"> + <reference key="NSMenu" ref="649796088"/> + <string key="NSTitle">^IDS_PROFILES_OPTIONS_GROUP_NAME</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">46100</int> + </object> <object class="NSMenuItem" id="391199113"> <reference key="NSMenu" ref="649796088"/> <string key="NSTitle">^IDS_HELP_MENU_MAC</string> @@ -1859,6 +1868,7 @@ <reference ref="299901009"/> <reference ref="586577488"/> <reference ref="445514911"/> + <reference ref="657848419"/> </object> <reference key="parent" ref="0"/> <string key="objectName">Main Menu</string> @@ -2690,6 +2700,11 @@ <reference key="object" ref="499460629"/> <reference key="parent" ref="789758025"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">691</int> + <reference key="object" ref="657848419"/> + <reference key="parent" ref="649796088"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -2886,6 +2901,7 @@ <string>687.IBPluginDependency</string> <string>689.IBPluginDependency</string> <string>689.ImportedFromIB2</string> + <string>691.IBPluginDependency</string> <string>72.IBPluginDependency</string> <string>72.ImportedFromIB2</string> <string>73.IBPluginDependency</string> @@ -2962,7 +2978,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{592, 471}, {358, 263}}</string> + <string>{{512, 142}, {358, 263}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{197, 734}, {243, 243}}</string> @@ -3006,7 +3022,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{525, 802}, {197, 73}}</string> - <string>{{177, 734}, {1578, 20}}</string> + <string>{{70, 405}, {1852, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{74, 862}</string> @@ -3102,6 +3118,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3141,7 +3158,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">690</int> + <int key="maxID">691</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> |