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

Unified Diff: chrome/browser/ui/browser.cc

Issue 12013004: alternate ntp: unpinned bookmark bar in ntp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_bar_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 5c4daaf11d202c6184033ce4e562b64fbcde1fec..2595966a7bf74148453b2068cdfc460cd309ba8d 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2228,13 +2228,9 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
state = BookmarkBar::HIDDEN;
}
- // Don't allow the bookmark bar to be shown in suggestions mode or
- // for instant extended api, non-NTP modes when it's detached.
- if (search_model_->mode().is_search_suggestions() ||
- (chrome::search::IsInstantExtendedAPIEnabled(profile_) &&
- !search_model_->mode().is_ntp() && state == BookmarkBar::DETACHED)) {
+ // Don't allow the bookmark bar to be shown in suggestions mode.
+ if (search_model_->mode().is_search_suggestions())
state = BookmarkBar::HIDDEN;
- }
if (state == bookmark_bar_state_)
return;
@@ -2254,8 +2250,7 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
// Don't animate if mode is |NTP| because the bookmark is attached at top when
// pref is on and detached at bottom when off.
BookmarkBar::AnimateChangeType animate_type =
- ((reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE &&
- !search_model_->mode().is_ntp()) ||
+ (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE ||
reason == BOOKMARK_BAR_STATE_CHANGE_INSTANT_PREVIEW_STATE) ?
BookmarkBar::ANIMATE_STATE_CHANGE :
BookmarkBar::DONT_ANIMATE_STATE_CHANGE;
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698