summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/bookmark_bar_gtk.h
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 18:23:58 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 18:23:58 +0000
commit9f040e43fec71f77dd9c201aa5397e314de4c07a (patch)
tree951f4bde2e7f6dc1d9c3a1dc1923890aa1c80b5d /chrome/browser/gtk/bookmark_bar_gtk.h
parent0e161112cc06b7d77d8c9b73b334b209d79e12d1 (diff)
downloadchromium_src-9f040e43fec71f77dd9c201aa5397e314de4c07a.zip
chromium_src-9f040e43fec71f77dd9c201aa5397e314de4c07a.tar.gz
chromium_src-9f040e43fec71f77dd9c201aa5397e314de4c07a.tar.bz2
A little bit of bookmark bar cleanup, a little bit of padding improvement.
The spacing between the toolbar buttons now matches windows pixel for pixel (tested empirically). The bookmark bar item spacing is now a little better, but we need some hackery to improve it to the state of windows (we need to annex about 5 pixels from the toolbar when the bookmark bar is open). The code for packing bookmark bar buttons is now all in one place. Functional change: There will be no other bookmarks button until the model is loaded. If you care I can fix this, it just doesn't seem like a very important matter since it's unusable anyway when the model isn't loaded.o I also removed a log warning from chrome_dll_main because with this change it started spamming a lot. We're already living with this warning, and have a bug filed for it (they fixed the root problem in newer versions of gtk so I think this bug will just never get resolved), so I don't think this is a big deal. BUG=15870 TEST=things look marginally better, theming still works properly Review URL: http://codereview.chromium.org/155342 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_bar_gtk.h')
-rw-r--r--chrome/browser/gtk/bookmark_bar_gtk.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h
index 22cfa0d..f179b15 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.h
+++ b/chrome/browser/gtk/bookmark_bar_gtk.h
@@ -77,11 +77,11 @@ class BookmarkBarGtk : public AnimationDelegate,
private:
// Helper function which generates GtkToolItems for |bookmark_toolbar_|.
- void CreateAllBookmarkButtons(const BookmarkNode* node);
+ void CreateAllBookmarkButtons();
// Sets the visibility of the instructional text based on whether there are
- // any bookmarks in |node|. |node| is assumed to be the bookmarks bar node.
- void SetInstructionState(const BookmarkNode* boomarks_bar_node);
+ // any bookmarks in the bookmark bar node.
+ void SetInstructionState();
// Helper function which destroys all the bookmark buttons in the GtkToolbar.
void RemoveAllBookmarkButtons();
@@ -93,7 +93,7 @@ class BookmarkBarGtk : public AnimationDelegate,
// Overridden from BookmarkModelObserver:
- // Invoked when the bookmark bar model has finished loading. Creates a button
+ // Invoked when the bookmark model has finished loading. Creates a button
// for each of the children of the root node from the model.
virtual void Loaded(BookmarkModel* model);
@@ -217,10 +217,6 @@ class BookmarkBarGtk : public AnimationDelegate,
// The other bookmarks button.
GtkWidget* other_bookmarks_button_;
- // The label inside |other_bookmarks_button_|. We keep a reference so we can
- // change the text color.
- GtkWidget* other_bookmarks_label_;
-
// Whether we should ignore the next button release event (because we were
// dragging).
bool ignore_button_release_;