| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 967 } else if (bookmark_bar_state_ == BookmarkBar::DETACHED) { | 967 } else if (bookmark_bar_state_ == BookmarkBar::DETACHED) { |
| 968 UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromFloatingBookmarkBarView", | 968 UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromFloatingBookmarkBarView", |
| 969 time_from_install); | 969 time_from_install); |
| 970 } | 970 } |
| 971 | 971 |
| 972 chrome::ShowImportDialog(browser_); | 972 chrome::ShowImportDialog(browser_); |
| 973 } | 973 } |
| 974 | 974 |
| 975 void BookmarkBarView::OnBookmarkBubbleShown(const GURL& url) { | 975 void BookmarkBarView::OnBookmarkBubbleShown(const GURL& url) { |
| 976 StopThrobbing(true); | 976 StopThrobbing(true); |
| 977 const BookmarkNode* node = model_->GetMostRecentlyAddedUserNodeForURL(url); | 977 const BookmarkNode* node = model_->GetMostRecentlyAddedNodeForURL(url); |
| 978 if (!node) | 978 if (!node) |
| 979 return; // Generally shouldn't happen. | 979 return; // Generally shouldn't happen. |
| 980 StartThrobbing(node, false); | 980 StartThrobbing(node, false); |
| 981 } | 981 } |
| 982 | 982 |
| 983 void BookmarkBarView::OnBookmarkBubbleHidden() { | 983 void BookmarkBarView::OnBookmarkBubbleHidden() { |
| 984 StopThrobbing(false); | 984 StopThrobbing(false); |
| 985 } | 985 } |
| 986 | 986 |
| 987 void BookmarkBarView::BookmarkModelLoaded(BookmarkModel* model, | 987 void BookmarkBarView::BookmarkModelLoaded(BookmarkModel* model, |
| (...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1829 DCHECK(apps_page_shortcut_); | 1829 DCHECK(apps_page_shortcut_); |
| 1830 // Only perform layout if required. | 1830 // Only perform layout if required. |
| 1831 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( | 1831 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( |
| 1832 browser_->profile(), browser_->host_desktop_type()); | 1832 browser_->profile(), browser_->host_desktop_type()); |
| 1833 if (apps_page_shortcut_->visible() == visible) | 1833 if (apps_page_shortcut_->visible() == visible) |
| 1834 return; | 1834 return; |
| 1835 apps_page_shortcut_->SetVisible(visible); | 1835 apps_page_shortcut_->SetVisible(visible); |
| 1836 UpdateBookmarksSeparatorVisibility(); | 1836 UpdateBookmarksSeparatorVisibility(); |
| 1837 Layout(); | 1837 Layout(); |
| 1838 } | 1838 } |
| OLD | NEW |