Index: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h |
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h |
index 4bb93aca9330b0784bcbfe0d6cf10358f411a925..722ac925bd5b8efbfdca2fefa3df868a9b60efee 100644 |
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h |
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h |
@@ -5,10 +5,11 @@ |
#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_ |
#define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_ |
+#include <memory> |
+ |
#include "base/compiler_specific.h" |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/strings/string16.h" |
#include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h" |
#include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h" |
@@ -40,14 +41,15 @@ class BookmarkBubbleView : public LocationBarBubbleDelegateView, |
// |parent_window| is used to ensure the bubble closes if the parent closes. |
// Returns the newly created bubble's Widget or nullptr in case when the |
// bubble already exists. |
- static views::Widget* ShowBubble(views::View* anchor_view, |
- const gfx::Rect& anchor_rect, |
- gfx::NativeView parent_window, |
- bookmarks::BookmarkBubbleObserver* observer, |
- scoped_ptr<BubbleSyncPromoDelegate> delegate, |
- Profile* profile, |
- const GURL& url, |
- bool already_bookmarked); |
+ static views::Widget* ShowBubble( |
+ views::View* anchor_view, |
+ const gfx::Rect& anchor_rect, |
+ gfx::NativeView parent_window, |
+ bookmarks::BookmarkBubbleObserver* observer, |
+ std::unique_ptr<BubbleSyncPromoDelegate> delegate, |
+ Profile* profile, |
+ const GURL& url, |
+ bool already_bookmarked); |
static void Hide(); |
@@ -77,7 +79,7 @@ class BookmarkBubbleView : public LocationBarBubbleDelegateView, |
// Creates a BookmarkBubbleView. |
BookmarkBubbleView(views::View* anchor_view, |
bookmarks::BookmarkBubbleObserver* observer, |
- scoped_ptr<BubbleSyncPromoDelegate> delegate, |
+ std::unique_ptr<BubbleSyncPromoDelegate> delegate, |
Profile* profile, |
const GURL& url, |
bool newly_bookmarked); |
@@ -111,7 +113,7 @@ class BookmarkBubbleView : public LocationBarBubbleDelegateView, |
bookmarks::BookmarkBubbleObserver* observer_; |
// Delegate, to handle clicks on the sign in link. |
- scoped_ptr<BubbleSyncPromoDelegate> delegate_; |
+ std::unique_ptr<BubbleSyncPromoDelegate> delegate_; |
// The profile. |
Profile* profile_; |