Index: chrome/browser/ui/views/toolbar/app_menu.h |
diff --git a/chrome/browser/ui/views/toolbar/app_menu.h b/chrome/browser/ui/views/toolbar/app_menu.h |
index 507183d9f02be808701519115eb7f943cbfe5972..98e8ce7de517e2c549efff63fdc64a5f578c7604 100644 |
--- a/chrome/browser/ui/views/toolbar/app_menu.h |
+++ b/chrome/browser/ui/views/toolbar/app_menu.h |
@@ -6,10 +6,10 @@ |
#define CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_H_ |
#include <map> |
+#include <memory> |
#include <utility> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/observer_list.h" |
#include "base/time/time.h" |
#include "base/timer/elapsed_timer.h" |
@@ -157,7 +157,7 @@ class AppMenu : public views::MenuDelegate, |
// The views menu. Owned by |menu_runner_|. |
views::MenuItemView* root_; |
- scoped_ptr<views::MenuRunner> menu_runner_; |
+ std::unique_ptr<views::MenuRunner> menu_runner_; |
// Maps from the command ID in model to the model/index pair the item came |
// from. |
@@ -174,7 +174,7 @@ class AppMenu : public views::MenuDelegate, |
int selected_index_; |
// Used for managing the bookmark menu items. |
- scoped_ptr<BookmarkMenuDelegate> bookmark_menu_delegate_; |
+ std::unique_ptr<BookmarkMenuDelegate> bookmark_menu_delegate_; |
// Menu corresponding to IDC_BOOKMARKS_MENU. |
views::MenuItemView* bookmark_menu_; |
@@ -190,7 +190,7 @@ class AppMenu : public views::MenuDelegate, |
ExtensionToolbarMenuView* extension_toolbar_; |
// Used for managing "Recent tabs" menu items. |
- scoped_ptr<RecentTabsMenuModelDelegate> recent_tabs_menu_model_delegate_; |
+ std::unique_ptr<RecentTabsMenuModelDelegate> recent_tabs_menu_model_delegate_; |
content::NotificationRegistrar registrar_; |