diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-25 22:11:43 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-25 22:11:43 +0000 |
| commit | 3f34599d40afee4d071e33c12278931764dd7c56 (patch) | |
| tree | 018bf8b9a56134fd022a12b964e297999fcb17f2 /chrome/app | |
| parent | c9d989b20d74fcd1de89d5aad90f5ad11d11801c (diff) | |
| download | chromium_src-3f34599d40afee4d071e33c12278931764dd7c56.zip chromium_src-3f34599d40afee4d071e33c12278931764dd7c56.tar.gz chromium_src-3f34599d40afee4d071e33c12278931764dd7c56.tar.bz2 | |
Bookmark menu work. Notes:
- "add bookmark" menu item enable state (e.g. disabled if no windows)
- bookmark menus built dynamically (like before)
- bookmark menus rebuild when a bookmark is added/removed
- bookmark menus take the current browser to where you want to go
- works with multiple windows (main window goes to bookmark location)
- works with no windows (bookmarks open a new window)
Review URL: http://codereview.chromium.org/49005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_resource.h | 6 | ||||
| -rw-r--r-- | chrome/app/nibs/en.lproj/MainMenu.xib | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h index b981be7..d89c825 100644 --- a/chrome/app/chrome_dll_resource.h +++ b/chrome/app/chrome_dll_resource.h @@ -200,7 +200,5 @@ // Identifiers for platform-specific items. // Placed in a common file to help insure they never collide. -#define IDC_BOOKMARK_MENU 43000 // OSX only -#define IDC_BOOKMARK_MENUITEM_BASE 43001 // OSX only -// Numbers 43002-43998 reserved for menu items -#define IDC_BOOKMARK_MENUITEM_MAX 43999 // OSX only +#define IDC_BOOKMARK_MENU 43000 // OSX only + diff --git a/chrome/app/nibs/en.lproj/MainMenu.xib b/chrome/app/nibs/en.lproj/MainMenu.xib index dd592bf..1cb6c61 100644 --- a/chrome/app/nibs/en.lproj/MainMenu.xib +++ b/chrome/app/nibs/en.lproj/MainMenu.xib @@ -882,6 +882,7 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">35000</int> </object> </object> </object> @@ -2457,7 +2458,7 @@ <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{262, 631}, {243, 263}}</string> + <string>{{264, 632}, {243, 263}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{197, 734}, {243, 243}}</string> @@ -2557,7 +2558,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{425, 862}, {230, 33}}</string> + <string>{{425, 861}, {230, 33}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> @@ -2568,7 +2569,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{356, 801}, {188, 93}}</string> + <string>{{358, 801}, {188, 93}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> |