summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-26 03:06:42 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-26 03:06:42 +0000
commit60574937adceadbabbeef0c6a8200883a36addc3 (patch)
tree6b5bf3701d8026901d061e7354daa881454b54e7 /chrome/app
parentc38fb9c2836af980e32db36e337fa12a2a6b44af (diff)
downloadchromium_src-60574937adceadbabbeef0c6a8200883a36addc3.zip
chromium_src-60574937adceadbabbeef0c6a8200883a36addc3.tar.gz
chromium_src-60574937adceadbabbeef0c6a8200883a36addc3.tar.bz2
Reland "Remove IDC_AUTOFILL_DEFAULT completely."
Now with the proper fix to the Mac nibs files under chrome/app/nibs. Pointed out by Scott Hess (shess@chroium.org). BUG=86901 TEST=None R=shess@chromium.org,dhollowa@chromium.org Review URL: http://codereview.chromium.org/7477002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_command_ids.h21
-rw-r--r--chrome/app/chrome_dll.rc1
-rw-r--r--chrome/app/nibs/MainMenu.xib4
3 files changed, 12 insertions, 14 deletions
diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
index 53a53f5..ab5318a 100644
--- a/chrome/app/chrome_command_ids.h
+++ b/chrome/app/chrome_command_ids.h
@@ -160,17 +160,16 @@
#define IDC_ABOUT 40018
#define IDC_HELP_PAGE 40019
#define IDC_SHOW_APP_MENU 40020
-#define IDC_MANAGE_EXTENSIONS 40022
-#define IDC_AUTOFILL_DEFAULT 40023
-#define IDC_DEV_TOOLS_INSPECT 40025
-#define IDC_UPGRADE_DIALOG 40026
-#define IDC_VIEW_INCOMPATIBILITIES 40027
-#define IDC_VIEW_BACKGROUND_PAGES 40028
-#define IDC_SHOW_KEYBOARD_OVERLAY 40029
-#define IDC_PROFILING_ENABLED 40030
-#define IDC_FILE_MANAGER 40031
-#define IDC_BOOKMARKS_MENU 40032
-#define IDC_SHOW_SYNC_SETUP 40033
+#define IDC_MANAGE_EXTENSIONS 40021
+#define IDC_DEV_TOOLS_INSPECT 40022
+#define IDC_UPGRADE_DIALOG 40023
+#define IDC_VIEW_INCOMPATIBILITIES 40024
+#define IDC_VIEW_BACKGROUND_PAGES 40025
+#define IDC_SHOW_KEYBOARD_OVERLAY 40026
+#define IDC_PROFILING_ENABLED 40027
+#define IDC_FILE_MANAGER 40028
+#define IDC_BOOKMARKS_MENU 40029
+#define IDC_SHOW_SYNC_SETUP 40030
// Spell-check
// Insert any additional suggestions before _LAST; these have to be consecutive.
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index a19366b..b617864 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -33,7 +33,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// pick those up in the WM_APPCOMMAND message.
IDR_MAINFRAME ACCELERATORS
BEGIN
- "A", IDC_AUTOFILL_DEFAULT, VIRTKEY, CONTROL, SHIFT
VK_LEFT, IDC_BACK, VIRTKEY, ALT
VK_BACK, IDC_BACK, VIRTKEY
"D", IDC_BOOKMARK_PAGE, VIRTKEY, CONTROL
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib
index e76672a..781414e 100644
--- a/chrome/app/nibs/MainMenu.xib
+++ b/chrome/app/nibs/MainMenu.xib
@@ -962,7 +962,7 @@
<reference key="NSOnImage" ref="353210768"/>
<reference key="NSMixedImage" ref="549394948"/>
<string key="NSAction">submenuAction:</string>
- <int key="NSTag">40032</int>
+ <int key="NSTag">40029</int>
<object class="NSMenu" key="NSSubmenu" id="891828782">
<string key="NSTitle">^IDS_BOOKMARKS_MENU</string>
<object class="NSMutableArray" key="NSMenuItems">
@@ -1118,7 +1118,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="353210768"/>
<reference key="NSMixedImage" ref="549394948"/>
- <int key="NSTag">40022</int>
+ <int key="NSTag">40021</int>
</object>
<object class="NSMenuItem" id="693413486">
<reference key="NSMenu" ref="835318025"/>