diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 23:20:20 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 23:20:20 +0000 |
| commit | a206b446481a9d522958a98e03912aba8c02bb4b (patch) | |
| tree | ef94c7d31020aaa871117fa1d23b352db34f0940 /chrome/browser/gtk | |
| parent | 96a41a0ec6889b5923a92454eafaf39fd63277cf (diff) | |
| download | chromium_src-a206b446481a9d522958a98e03912aba8c02bb4b.zip chromium_src-a206b446481a9d522958a98e03912aba8c02bb4b.tar.gz chromium_src-a206b446481a9d522958a98e03912aba8c02bb4b.tar.bz2 | |
* Add ctrl-shift-d to bookmark all tabs.
* Enable or disable bookmark commands based on whether we're actually going to be able to bookmark anything.
* Rename IDC_STAR to IDC_BOOKMARK_PAGE, which is more obvious.
BUG=2935
TEST=Hit ctrl-shift-d, make sure it bookmarks all tabs
Review URL: http://codereview.chromium.org/266029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/browser_toolbar_gtk.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index f2bba91..c598070 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -84,7 +84,7 @@ BrowserToolbarGtk::BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* window) browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this); browser_->command_updater()->AddCommandObserver(IDC_RELOAD, this); browser_->command_updater()->AddCommandObserver(IDC_HOME, this); - browser_->command_updater()->AddCommandObserver(IDC_STAR, this); + browser_->command_updater()->AddCommandObserver(IDC_BOOKMARK_PAGE, this); registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED, @@ -298,7 +298,7 @@ void BrowserToolbarGtk::EnabledStateChangedForCommand(int id, bool enabled) { if (home_.get()) widget = home_->widget(); break; - case IDC_STAR: + case IDC_BOOKMARK_PAGE: widget = star_->widget(); break; } @@ -600,7 +600,7 @@ void BrowserToolbarGtk::OnButtonClick(GtkWidget* button, } else if (toolbar->home_.get() && button == toolbar->home_->widget()) { tag = IDC_HOME; } else if (button == toolbar->star_->widget()) { - tag = IDC_STAR; + tag = IDC_BOOKMARK_PAGE; } DCHECK_NE(tag, -1) << "Unexpected button click callback"; diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index d7d7bfb..b1f5983 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -286,8 +286,8 @@ const struct AcceleratorMapping { { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, // Miscellany. - { GDK_d, IDC_STAR, GDK_CONTROL_MASK }, - { XF86XK_AddFavorite, IDC_STAR, GdkModifierType(0) }, + { GDK_d, IDC_BOOKMARK_PAGE, GDK_CONTROL_MASK }, + { XF86XK_AddFavorite, IDC_BOOKMARK_PAGE, GdkModifierType(0) }, { XF86XK_Favorites, IDC_SHOW_BOOKMARK_BAR, GdkModifierType(0) }, { XF86XK_History, IDC_SHOW_HISTORY, GdkModifierType(0) }, { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK }, |