summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 23:20:20 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 23:20:20 +0000
commita206b446481a9d522958a98e03912aba8c02bb4b (patch)
treeef94c7d31020aaa871117fa1d23b352db34f0940 /chrome/app
parent96a41a0ec6889b5923a92454eafaf39fd63277cf (diff)
downloadchromium_src-a206b446481a9d522958a98e03912aba8c02bb4b.zip
chromium_src-a206b446481a9d522958a98e03912aba8c02bb4b.tar.gz
chromium_src-a206b446481a9d522958a98e03912aba8c02bb4b.tar.bz2
* Add ctrl-shift-d to bookmark all tabs.
* Enable or disable bookmark commands based on whether we're actually going to be able to bookmark anything. * Rename IDC_STAR to IDC_BOOKMARK_PAGE, which is more obvious. BUG=2935 TEST=Hit ctrl-shift-d, make sure it bookmarks all tabs Review URL: http://codereview.chromium.org/266029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_dll.rc3
-rw-r--r--chrome/app/chrome_dll_resource.h13
-rw-r--r--chrome/app/nibs/MainMenu.xib8
-rw-r--r--chrome/app/nibs/Toolbar.xib4
4 files changed, 15 insertions, 13 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index c32d2dd..5a26df5 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -34,6 +34,8 @@ IDR_MAINFRAME ACCELERATORS
BEGIN
VK_LEFT, IDC_BACK, VIRTKEY, ALT
VK_BACK, IDC_BACK, VIRTKEY
+ "D", IDC_BOOKMARK_PAGE, VIRTKEY, CONTROL
+ "D", IDC_BOOKMARK_ALL_TABS, VIRTKEY, CONTROL, SHIFT
VK_DELETE, IDC_CLEAR_BROWSING_DATA, VIRTKEY, CONTROL, SHIFT
VK_F4, IDC_CLOSE_TAB, VIRTKEY, CONTROL
"W", IDC_CLOSE_TAB, VIRTKEY, CONTROL
@@ -122,7 +124,6 @@ BEGIN
"H", IDC_SHOW_HISTORY, VIRTKEY, CONTROL
"F", IDC_SHOW_APP_MENU, VIRTKEY, ALT
"E", IDC_SHOW_PAGE_MENU, VIRTKEY, ALT
- "D", IDC_STAR, VIRTKEY, CONTROL
VK_ESCAPE, IDC_STOP, VIRTKEY
VK_ESCAPE, IDC_TASK_MANAGER, VIRTKEY, SHIFT
"U", IDC_VIEW_SOURCE, VIRTKEY, CONTROL
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index 91a802d..92e7487 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_resource.h
@@ -84,12 +84,13 @@
#define IDC_MOVE_TAB_PREVIOUS 34033
// Page-related commands
-#define IDC_STAR 35000
-#define IDC_VIEW_SOURCE 35001
-#define IDC_CLOSE_POPUPS 35002
-#define IDC_PRINT 35003
-#define IDC_SAVE_PAGE 35004
-#define IDC_ENCODING_MENU 35005
+#define IDC_BOOKMARK_PAGE 35000
+#define IDC_BOOKMARK_ALL_TABS 35001
+#define IDC_VIEW_SOURCE 35002
+#define IDC_CLOSE_POPUPS 35003
+#define IDC_PRINT 35004
+#define IDC_SAVE_PAGE 35005
+#define IDC_ENCODING_MENU 35006
// When adding a new encoding to this list, be sure to append it to the
// EncodingMenuController::kValidEncodingIds array in
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib
index 3512963..3b777a8 100644
--- a/chrome/app/nibs/MainMenu.xib
+++ b/chrome/app/nibs/MainMenu.xib
@@ -320,7 +320,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="353210768"/>
<reference key="NSMixedImage" ref="549394948"/>
- <int key="NSTag">35004</int>
+ <int key="NSTag">35005</int>
</object>
<object class="NSMenuItem" id="553348595">
<reference key="NSMenu" ref="720053764"/>
@@ -368,7 +368,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="353210768"/>
<reference key="NSMixedImage" ref="549394948"/>
- <int key="NSTag">35003</int>
+ <int key="NSTag">35004</int>
</object>
</object>
</object>
@@ -712,7 +712,7 @@
<reference key="NSOnImage" ref="353210768"/>
<reference key="NSMixedImage" ref="549394948"/>
<string key="NSAction">submenuAction:</string>
- <int key="NSTag">35005</int>
+ <int key="NSTag">35006</int>
<object class="NSMenu" key="NSSubmenu" id="466817936">
<string key="NSTitle">^IDS_TEXT_ENCODING_MAC</string>
<object class="NSMutableArray" key="NSMenuItems">
@@ -740,7 +740,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="353210768"/>
<reference key="NSMixedImage" ref="549394948"/>
- <int key="NSTag">35001</int>
+ <int key="NSTag">35002</int>
</object>
<object class="NSMenuItem" id="703868281">
<reference key="NSMenu" ref="99609113"/>
diff --git a/chrome/app/nibs/Toolbar.xib b/chrome/app/nibs/Toolbar.xib
index 0548137..9ab07a1 100644
--- a/chrome/app/nibs/Toolbar.xib
+++ b/chrome/app/nibs/Toolbar.xib
@@ -384,7 +384,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="610745052"/>
<reference key="NSMixedImage" ref="1070349142"/>
- <int key="NSTag">35004</int>
+ <int key="NSTag">35005</int>
</object>
<object class="NSMenuItem" id="950677546">
<reference key="NSMenu" ref="1035953805"/>
@@ -490,7 +490,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="610745052"/>
<reference key="NSMixedImage" ref="1070349142"/>
- <int key="NSTag">35001</int>
+ <int key="NSTag">35002</int>
</object>
<object class="NSMenuItem" id="830865062">
<reference key="NSMenu" ref="383305928"/>