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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc

Issue 1308293002: [Mac] Refactor bookmark pulsing into BookmarkBubbleObserverCocoa. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarkeditor
Patch Set: Address comments. Update unit_tests. Created 5 years, 4 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
Index: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index 66aef8123fa940e9339716ccd73d747f37be0e05..924b1617624d1b8aefee3abe4493348928a453e6 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -10,9 +10,9 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/bookmarks/bookmark_bubble_observer.h"
#include "chrome/browser/ui/bookmarks/bookmark_editor.h"
#include "chrome/browser/ui/sync/sync_promo_ui.h"
-#include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view_observer.h"
#include "chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view.h"
#include "chrome/grit/generated_resources.h"
#include "components/bookmarks/browser/bookmark_model.h"
@@ -63,7 +63,7 @@ BookmarkBubbleView* BookmarkBubbleView::bookmark_bubble_ = NULL;
// static
void BookmarkBubbleView::ShowBubble(views::View* anchor_view,
- BookmarkBubbleViewObserver* observer,
+ bookmarks::BookmarkBubbleObserver* observer,
scoped_ptr<BookmarkBubbleDelegate> delegate,
Profile* profile,
const GURL& url,
@@ -82,8 +82,11 @@ void BookmarkBubbleView::ShowBubble(views::View* anchor_view,
bookmark_bubble_->title_tf_->SelectAll(true);
bookmark_bubble_->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
- if (bookmark_bubble_->observer_)
- bookmark_bubble_->observer_->OnBookmarkBubbleShown(url);
+ if (bookmark_bubble_->observer_) {
+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
+ const BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url);
+ bookmark_bubble_->observer_->OnBookmarkBubbleShown(node);
+ }
}
void BookmarkBubbleView::Hide() {
@@ -264,7 +267,7 @@ views::View* BookmarkBubbleView::GetInitiallyFocusedView() {
BookmarkBubbleView::BookmarkBubbleView(
views::View* anchor_view,
- BookmarkBubbleViewObserver* observer,
+ bookmarks::BookmarkBubbleObserver* observer,
scoped_ptr<BookmarkBubbleDelegate> delegate,
Profile* profile,
const GURL& url,

Powered by Google App Engine
This is Rietveld 408576698