Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6208)

Unified Diff: chrome/browser/views/bookmark_bar_view.cc

Issue 3056003: Attemp 2 at: (Closed)
Patch Set: Fix chromeos breakage Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/bookmark_bar_view.h ('k') | chrome/browser/views/browser_actions_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/bookmark_bar_view.cc
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 83bbfef75610c1298056523dc066dd9c6104d5d4..26baaacce436aeb52957a469bd5421cf3b946977 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -460,11 +460,7 @@ void BookmarkBarView::SetPageNavigator(PageNavigator* navigator) {
}
gfx::Size BookmarkBarView::GetPreferredSize() {
- // Extension apps don't show the bookmark bar.
- if (!OnAppsPage())
- return LayoutItems(true);
- else
- return gfx::Size();
+ return LayoutItems(true);
}
gfx::Size BookmarkBarView::GetMinimumSize() {
@@ -756,11 +752,6 @@ bool BookmarkBarView::OnNewTabPage() const {
browser_->GetSelectedTabContents()->ShouldShowBookmarkBar());
}
-bool BookmarkBarView::OnAppsPage() const {
- return (browser_ && browser_->GetSelectedTabContents() &&
- browser_->GetSelectedTabContents()->is_app());
-}
-
int BookmarkBarView::GetToolbarOverlap(bool return_max) {
return static_cast<int>(kToolbarOverlap *
(return_max ? 1.0 : size_animation_->GetCurrentValue()));
« no previous file with comments | « chrome/browser/views/bookmark_bar_view.h ('k') | chrome/browser/views/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698