Index: chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h |
diff --git a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h |
index 277f3dbca89afdb6b02483bd5aa5c868fed1b6f7..1b1b4ef7d6a95be9caaf85fe196049fc2307c216 100644 |
--- a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h |
+++ b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h |
@@ -7,8 +7,9 @@ |
#import <Cocoa/Cocoa.h> |
+#include <memory> |
+ |
#include "base/mac/scoped_nsobject.h" |
-#include "base/memory/scoped_ptr.h" |
#import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h" |
#include "chrome/browser/ui/toolbar/back_forward_menu_model.h" |
@@ -29,7 +30,7 @@ const BackForwardMenuType BACK_FORWARD_MENU_TYPE_FORWARD = |
@private |
BackForwardMenuType type_; |
MenuButton* button_; // Weak; comes from nib. |
- scoped_ptr<BackForwardMenuModel> model_; |
+ std::unique_ptr<BackForwardMenuModel> model_; |
base::scoped_nsobject<NSMenu> backForwardMenu_; |
} |