GTK: First draft of the unified cut/copy/paste and +/-/Fullscreen menu items.

chrome/browser/gtk/gtk_util.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/gtk_util.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include <cstdarg>
@@ skipping 431 matching lines @@
   GtkWidget* centering_vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(centering_vbox), widget, TRUE, FALSE, 0);
   if (pack_at_end)
     gtk_box_pack_end(GTK_BOX(hbox), centering_vbox, FALSE, FALSE, padding);
   else
     gtk_box_pack_start(GTK_BOX(hbox), centering_vbox, FALSE, FALSE, padding);
 
   return centering_vbox;
 }
 
-std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label) {
+namespace {
+
+// Common implementation of ConvertAcceleratorsFromWindowsStyle() and
+// RemoveWindowsStyleAccelerators().
+std::string ConvertAmperstandsTo(const std::string& label,
+                                 const std::string& target) {
   std::string ret;
   ret.reserve(label.length() * 2);
   for (size_t i = 0; i < label.length(); ++i) {
     if ('_' == label[i]) {
       ret.push_back('_');
       ret.push_back('_');
     } else if ('&' == label[i]) {
       if (i + 1 < label.length() && '&' == label[i + 1]) {
         ret.push_back(label[i]);
         ++i;
       } else {
-        ret.push_back('_');
+        ret.append(target);
       }
     } else {
       ret.push_back(label[i]);
     }
   }
 
   return ret;
 }
 
+}  // namespace
+
+std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label) {
+  return ConvertAmperstandsTo(label, "_");
+}
+
+std::string RemoveWindowsStyleAccelerators(const std::string& label) {
+  return ConvertAmperstandsTo(label, "");
+}
+
 bool IsScreenComposited() {
   GdkScreen* screen = gdk_screen_get_default();
   return gdk_screen_is_composited(screen) == TRUE;
 }
 
 void EnumerateTopLevelWindows(x11_util::EnumerateWindowsDelegate* delegate) {
   std::vector<XID> stack;
   if (!x11_util::GetXWindowStack(&stack)) {
     // Window Manager doesn't support _NET_CLIENT_LIST_STACKING, so fall back
     // to old school enumeration of all X windows.  Some WMs parent 'top-level'
@@ skipping 560 matching lines @@
   gint x = 0, y = 0, width = 1, height = 1;
   gtk_window_get_position(GTK_WINDOW(dialog), &x, &y);
   gtk_window_get_size(GTK_WINDOW(dialog), &width, &height);
 
   return gfx::Rect(x, y, width, height);
 }
 
 #endif
 
 }  // namespace gtk_util