diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-05 23:09:04 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-05 23:09:04 +0000 |
| commit | cc7c1c77040c26a56de3eeb953f468ced2a32186 (patch) | |
| tree | 4ca3048a6d816ea9aaf324054703623c472a7a34 /chrome/browser/gtk/options/general_page_gtk.cc | |
| parent | e9fd14ddb1888ac8906f04148f727467901c763b (diff) | |
| download | chromium_src-cc7c1c77040c26a56de3eeb953f468ced2a32186.zip chromium_src-cc7c1c77040c26a56de3eeb953f468ced2a32186.tar.gz chromium_src-cc7c1c77040c26a56de3eeb953f468ced2a32186.tar.bz2 | |
Move ConvertAcceleratorsFromWindowsStyle into chrome/common/gtk_util.
Use it on the custom startup url buttons.
BUG=11507
Review URL: http://codereview.chromium.org/118327
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options/general_page_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/options/general_page_gtk.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc index 76ee824..5bf8d49 100644 --- a/chrome/browser/gtk/options/general_page_gtk.cc +++ b/chrome/browser/gtk/options/general_page_gtk.cc @@ -14,6 +14,7 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/session_startup_pref.h" #include "chrome/browser/shell_integration.h" +#include "chrome/common/gtk_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" @@ -229,22 +230,23 @@ GtkWidget* GeneralPageGtk::InitStartupGroup() { gtk_box_pack_end(GTK_BOX(url_list_container), url_list_buttons, FALSE, FALSE, 0); - // TODO(mattm): fix mnemonics (see - // MenuGtk::ConvertAcceleratorsFromWindowsStyle) - startup_add_custom_page_button_ = gtk_button_new_with_label( - l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_ADD_BUTTON).c_str()); + startup_add_custom_page_button_ = gtk_button_new_with_mnemonic( + gtk_util::ConvertAcceleratorsFromWindowsStyle( + l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_ADD_BUTTON)).c_str()); g_signal_connect(G_OBJECT(startup_add_custom_page_button_), "clicked", G_CALLBACK(OnStartupAddCustomPageClicked), this); gtk_box_pack_start(GTK_BOX(url_list_buttons), startup_add_custom_page_button_, FALSE, FALSE, 0); - startup_remove_custom_page_button_ = gtk_button_new_with_label( - l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_REMOVE_BUTTON).c_str()); + startup_remove_custom_page_button_ = gtk_button_new_with_mnemonic( + gtk_util::ConvertAcceleratorsFromWindowsStyle( + l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_REMOVE_BUTTON)).c_str()); g_signal_connect(G_OBJECT(startup_remove_custom_page_button_), "clicked", G_CALLBACK(OnStartupRemoveCustomPageClicked), this); gtk_box_pack_start(GTK_BOX(url_list_buttons), startup_remove_custom_page_button_, FALSE, FALSE, 0); - startup_use_current_page_button_ = gtk_button_new_with_label( - l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_USE_CURRENT).c_str()); + startup_use_current_page_button_ = gtk_button_new_with_mnemonic( + gtk_util::ConvertAcceleratorsFromWindowsStyle( + l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_USE_CURRENT)).c_str()); g_signal_connect(G_OBJECT(startup_use_current_page_button_), "clicked", G_CALLBACK(OnStartupUseCurrentPageClicked), this); gtk_box_pack_start(GTK_BOX(url_list_buttons), |