diff options
-rw-r--r-- | chrome/browser/defaults.cc | 1 | ||||
-rw-r--r-- | chrome/browser/defaults.h | 4 | ||||
-rw-r--r-- | chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc | 5 | ||||
-rw-r--r-- | chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h | 3 | ||||
-rw-r--r-- | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc | 3 |
5 files changed, 5 insertions, 11 deletions
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc index f99d19b..3ec3b87 100644 --- a/chrome/browser/defaults.cc +++ b/chrome/browser/defaults.cc @@ -96,7 +96,6 @@ const bool kBrowserAliveWithNoWindows = false; #endif const int kBookmarkBarHeight = 28; -const int kNewtabBookmarkBarHeight = 57; const ui::ResourceBundle::FontStyle kAssociatedNetworkFontStyle = ui::ResourceBundle::BoldFont; diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h index ac0e068..d3e3e82 100644 --- a/chrome/browser/defaults.h +++ b/chrome/browser/defaults.h @@ -71,10 +71,8 @@ extern const bool kAlwaysOpenIncognitoWindow; // Should the close button be shown in the Task Manager dialog? extern const bool kShowCancelButtonInTaskManager; -// Preferred height of the bookmarks bar when shown on every page and -// when shown only on the new tab page. +// Preferred height of the bookmarks bar when shown on every page. extern const int kBookmarkBarHeight; -extern const int kNewtabBookmarkBarHeight; // ChromiumOS network menu font extern const ui::ResourceBundle::FontStyle kAssociatedNetworkFontStyle; diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc index fdb4634..12e2e4c 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc @@ -20,6 +20,7 @@ #include "chrome/browser/ntp_background_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" @@ -133,8 +134,6 @@ void RecordAppLaunch(Profile* profile, const GURL& url) { } // namespace -const int BookmarkBarGtk::kBookmarkBarNTPHeight = 57; - BookmarkBarGtk::BookmarkBarGtk(BrowserWindowGtk* window, Browser* browser, TabstripOriginProvider* tabstrip_origin_provider) @@ -324,7 +323,7 @@ void BookmarkBarGtk::CalculateMaxHeight() { max_height_ = req.height; } else { max_height_ = (bookmark_bar_state_ == BookmarkBar::DETACHED) ? - kBookmarkBarNTPHeight : kBookmarkBarHeight; + chrome::kNTPBookmarkBarHeight : kBookmarkBarHeight; } } diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h index f984d479..774c076 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h @@ -49,9 +49,6 @@ class BookmarkBarGtk : public ui::AnimationDelegate, public chrome::BookmarkBarInstructionsDelegate, public BookmarkContextMenuControllerDelegate { public: - // The NTP needs to have access to this. - static const int kBookmarkBarNTPHeight; - BookmarkBarGtk(BrowserWindowGtk* window, Browser* browser, TabstripOriginProvider* tabstrip_origin_provider); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 6c78bee..66ea7f1 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -26,6 +26,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/themes/theme_service.h" +#include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/browser.h" @@ -1679,7 +1680,7 @@ gfx::Size BookmarkBarView::LayoutItems(bool compute_bounds_only) { prefsize.set_height( browser_defaults::kBookmarkBarHeight + static_cast<int>( - (browser_defaults::kNewtabBookmarkBarHeight - + (chrome::kNTPBookmarkBarHeight - browser_defaults::kBookmarkBarHeight) * (1 - size_animation_->GetCurrentValue()))); } else { |