summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-28 23:49:47 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-28 23:49:47 +0000
commitc4a065c728d22c2a2d57fa6d6f675ef9f1ae73c3 (patch)
treecabfdfc1ff294b1c606eff2111bcd2fab329f50b
parentb1094256d59efa38d1b548d1e282e541db6efef1 (diff)
downloadchromium_src-c4a065c728d22c2a2d57fa6d6f675ef9f1ae73c3.zip
chromium_src-c4a065c728d22c2a2d57fa6d6f675ef9f1ae73c3.tar.gz
chromium_src-c4a065c728d22c2a2d57fa6d6f675ef9f1ae73c3.tar.bz2
gtk: Cleanup BookmarkBarGtk class.
- Remove unused constants. - Remove explicit keyword from constructor. - Move FRIEND_ macros to private section. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/6078009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70245 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/bookmark_bar_gtk.cc7
-rw-r--r--chrome/browser/gtk/bookmark_bar_gtk.h16
2 files changed, 9 insertions, 14 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index ab6c5a5..ea48a94 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -75,13 +75,6 @@ const int kInstructionsPadding = 6;
const int kOtherBookmarksPaddingHorizontal = 2;
const int kOtherBookmarksPaddingVertical = 1;
-// Middle color of the separator gradient.
-const double kSeparatorColor[] =
- { 194.0 / 255.0, 205.0 / 255.0, 212.0 / 212.0 };
-// Top color of the separator gradient.
-const double kTopBorderColor[] =
- { 222.0 / 255.0, 234.0 / 255.0, 248.0 / 255.0 };
-
// The targets accepted by the toolbar and folder buttons for DnD.
const int kDestTargetList[] = { gtk_dnd_util::CHROME_BOOKMARK_ITEM,
gtk_dnd_util::CHROME_NAMED_URL,
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h
index 0939c70..f0abe1b 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.h
+++ b/chrome/browser/gtk/bookmark_bar_gtk.h
@@ -44,14 +44,11 @@ class BookmarkBarGtk : public AnimationDelegate,
public NotificationObserver,
public BookmarkBarInstructionsGtk::Delegate,
public BookmarkContextMenuControllerDelegate {
- FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest, DisplaysHelpMessageOnEmpty);
- FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest,
- HidesHelpMessageWithBookmark);
- FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest, BuildsButtons);
public:
- explicit BookmarkBarGtk(BrowserWindowGtk* window,
- Profile* profile, Browser* browser,
- TabstripOriginProvider* tabstrip_origin_provider);
+ BookmarkBarGtk(BrowserWindowGtk* window,
+ Profile* profile,
+ Browser* browser,
+ TabstripOriginProvider* tabstrip_origin_provider);
virtual ~BookmarkBarGtk();
// Resets the profile. This removes any buttons for the current profile and
@@ -115,6 +112,11 @@ class BookmarkBarGtk : public AnimationDelegate,
virtual void CloseMenu();
private:
+ FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest, DisplaysHelpMessageOnEmpty);
+ FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest,
+ HidesHelpMessageWithBookmark);
+ FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest, BuildsButtons);
+
// Helper function which generates GtkToolItems for |bookmark_toolbar_|.
void CreateAllBookmarkButtons();