diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-06 00:28:35 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-06 00:28:35 +0000 |
| commit | 20ede07176ece47e95efa8f355ee68a61166b68c (patch) | |
| tree | 87b994d26fba0129ab5c28998f7ba9e99c04c735 /chrome/browser/gtk | |
| parent | 48285173b623d950ecb04be6fd120f464c447e61 (diff) | |
| download | chromium_src-20ede07176ece47e95efa8f355ee68a61166b68c.zip chromium_src-20ede07176ece47e95efa8f355ee68a61166b68c.tar.gz chromium_src-20ede07176ece47e95efa8f355ee68a61166b68c.tar.bz2 | |
Mac: Implements the special bookmark bar on NTP.
Based mostly on Ben's patch, but made it compile, work, and descoped
moving the bookmark bar around the view heiarchy.
XIB modification: The root view is now a BookmarkBarToolbarView instead of an NSView and is [BookmarkBarController view].
BUG=17625
Review URL: http://codereview.chromium.org/246034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index ab74be7..eee1b7f 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -326,7 +326,7 @@ bool BookmarkBarGtk::IsAnimating() { bool BookmarkBarGtk::OnNewTabPage() { return (browser_ && browser_->GetSelectedTabContents() && - browser_->GetSelectedTabContents()->IsBookmarkBarAlwaysVisible()); + browser_->GetSelectedTabContents()->ShouldShowBookmarkBar()); } void BookmarkBarGtk::Loaded(BookmarkModel* model) { diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index d9a43ca..7013294 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -1290,7 +1290,7 @@ void BrowserWindowGtk::MaybeShowBookmarkBar(TabContents* contents, show_bar = true; } - if (show_bar && contents && !contents->IsBookmarkBarAlwaysVisible()) { + if (show_bar && contents && !contents->ShouldShowBookmarkBar()) { PrefService* prefs = contents->profile()->GetPrefs(); show_bar = prefs->GetBoolean(prefs::kShowBookmarkBar) && !IsFullscreen(); } |