Adds support for showing accelerators in bookmark menus.

views/accelerator.cc

 // Copyright (c) 2006-2008 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 "views/accelerator.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
+#elif defined(OS_LINUX)
+#include <gdk/gdk.h>
 #endif
 
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
 
 namespace views {
 
 std::wstring Accelerator::GetShortcutText() const {
   int string_id = 0;
   switch(key_code_) {
     case base::VKEY_TAB:
       string_id = IDS_APP_TAB_KEY;
       break;
@@ skipping 49 matching lines @@
     // an unshifted mode (e.g. French AZERY layout has 'a with grave
     // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
     // default zoom level), we leave VK_[0-9] alone without translation.
     wchar_t key;
     if (key_code_ >= '0' && key_code_ <= '9')
       key = key_code_;
     else
       key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));
     shortcut += key;
 #elif defined(OS_LINUX)
-    NOTIMPLEMENTED();
+    gchar* name = gdk_keyval_name(gdk_keyval_to_lower(key_code_));
+    if (name) {
+      if (name[0] != 0 && name[1] == 0)
+        shortcut += static_cast<wchar_t>(g_ascii_toupper(name[0]));
+      else
+        shortcut += UTF8ToWide(name);
+    }
 #endif
   } else {
     shortcut = l10n_util::GetString(string_id);
   }
 
   // Checking whether the character used for the accelerator is alphanumeric.
   // If it is not, then we need to adjust the string later on if the locale is
   // right-to-left. See below for more information of why such adjustment is
   // required.
   std::wstring shortcut_rtl;
@@ skipping 42 matching lines @@
 
     // Subtracting the size of the shortcut key and 1 for the '+' sign.
     shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1);
     shortcut.swap(shortcut_rtl);
   }
 
   return shortcut;
 }
 
 }  // namespace views