Remove extra zoom menu items.

Review URL: http://codereview.chromium.org/73023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13699 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 19 insertions, 20 deletions

diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index f5655f2..a700d9d 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -103,13 +103,18 @@ gfx::Rect GetInitialWindowBounds(GtkWindow* window) {
 const struct AcceleratorMapping {
   guint keyval;
   int command_id;
+  GdkModifierType modifier_type;
 } kAcceleratorMap[] = {
-  { GDK_k, IDC_FOCUS_SEARCH },
-  { GDK_l, IDC_FOCUS_LOCATION },
-  { GDK_o, IDC_OPEN_FILE },
-  { GDK_Page_Down, IDC_SELECT_NEXT_TAB },
-  { GDK_Page_Up, IDC_SELECT_PREVIOUS_TAB },
-  { GDK_w, IDC_CLOSE_TAB },
+  { GDK_k, IDC_FOCUS_SEARCH, GDK_CONTROL_MASK },
+  { GDK_l, IDC_FOCUS_LOCATION, GDK_CONTROL_MASK },
+  { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK },
+  { GDK_Page_Down, IDC_SELECT_NEXT_TAB, GDK_CONTROL_MASK },
+  { GDK_Page_Up, IDC_SELECT_PREVIOUS_TAB, GDK_CONTROL_MASK },
+  { GDK_w, IDC_CLOSE_TAB, GDK_CONTROL_MASK },
+  { GDK_plus, IDC_ZOOM_PLUS, GdkModifierType(GDK_CONTROL_MASK|GDK_SHIFT_MASK) },
+  { GDK_equal, IDC_ZOOM_PLUS, GDK_CONTROL_MASK },
+  { GDK_0, IDC_ZOOM_NORMAL, GDK_CONTROL_MASK },
+  { GDK_minus, IDC_ZOOM_MINUS, GDK_CONTROL_MASK },
 };
 
 int GetCommandFromKeyval(guint accel_key) {
@@ -643,9 +648,11 @@ void BrowserWindowGtk::ConnectAccelerators() {
 
   for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
     gtk_accel_group_connect(
-        accel_group, kAcceleratorMap[i].keyval, GDK_CONTROL_MASK,
-        GtkAccelFlags(0), g_cclosure_new(G_CALLBACK(OnGtkAccelerator),
-        this, NULL));
+        accel_group,
+        kAcceleratorMap[i].keyval,
+        kAcceleratorMap[i].modifier_type,
+        GtkAccelFlags(0),
+        g_cclosure_new(G_CALLBACK(OnGtkAccelerator), this, NULL));
   }
 }
 
diff --git a/chrome/browser/gtk/standard_menus.cc b/chrome/browser/gtk/standard_menus.cc
index 1ca6ddc..3ac258b 100644
--- a/chrome/browser/gtk/standard_menus.cc
+++ b/chrome/browser/gtk/standard_menus.cc
@@ -4,31 +4,23 @@
 
 #include "chrome/browser/gtk/standard_menus.h"
 
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
 #include "base/basictypes.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/l10n_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
 namespace {
 
 struct MenuCreateMaterial zoom_menu_materials[] = {
   { MENU_NORMAL, IDC_ZOOM_PLUS, IDS_ZOOM_PLUS, 0, NULL,
-    GDK_plus, GDK_CONTROL_MASK|GDK_SHIFT_MASK },
-  { MENU_NORMAL, IDC_ZOOM_PLUS, IDS_ZOOM_PLUS, 0, NULL,
-    GDK_equal, GDK_CONTROL_MASK },
-  { MENU_NORMAL, IDC_ZOOM_PLUS, IDS_ZOOM_PLUS, 0, NULL,
     GDK_KP_Add, GDK_CONTROL_MASK },
   { MENU_NORMAL, IDC_ZOOM_NORMAL, IDS_ZOOM_NORMAL, 0, NULL,
-    GDK_0, GDK_CONTROL_MASK },
-  { MENU_NORMAL, IDC_ZOOM_NORMAL, IDS_ZOOM_NORMAL, 0, NULL,
     GDK_KP_0, GDK_CONTROL_MASK },
   { MENU_NORMAL, IDC_ZOOM_MINUS, IDS_ZOOM_MINUS, 0, NULL,
-    GDK_minus, GDK_CONTROL_MASK },
-  { MENU_NORMAL, IDC_ZOOM_MINUS, IDS_ZOOM_MINUS, 0, NULL,
     GDK_KP_Subtract, GDK_CONTROL_MASK },
   { MENU_END }
 };