Index: chrome/browser/ui/views/toolbar/toolbar_button.h |
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h |
index 11393df8efe1376ddc46d1f7bedc420ae1570731..c6e9915bff70fb174bfdab10fa0a40e0d1d59360 100644 |
--- a/chrome/browser/ui/views/toolbar/toolbar_button.h |
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h |
@@ -5,8 +5,9 @@ |
#ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ |
#define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/gfx/geometry/point.h" |
#include "ui/views/context_menu_controller.h" |
#include "ui/views/controls/button/button.h" |
@@ -54,7 +55,8 @@ class ToolbarButton : public views::LabelButton, |
void OnMouseExited(const ui::MouseEvent& event) override; |
void OnGestureEvent(ui::GestureEvent* event) override; |
void GetAccessibleState(ui::AXViewState* state) override; |
- scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override; |
+ std::unique_ptr<views::LabelButtonBorder> CreateDefaultBorder() |
+ const override; |
// views::ContextMenuController: |
void ShowContextMenuForView(View* source, |
@@ -79,7 +81,7 @@ class ToolbarButton : public views::LabelButton, |
Profile* profile_; |
// The model that populates the attached menu. |
- scoped_ptr<ui::MenuModel> model_; |
+ std::unique_ptr<ui::MenuModel> model_; |
// Indicates if menu is currently showing. |
bool menu_showing_; |
@@ -88,13 +90,13 @@ class ToolbarButton : public views::LabelButton, |
int y_position_on_lbuttondown_; |
// The model adapter for the drop down menu. |
- scoped_ptr<views::MenuModelAdapter> menu_model_adapter_; |
+ std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_; |
// Menu runner to display drop down menu. |
- scoped_ptr<views::MenuRunner> menu_runner_; |
+ std::unique_ptr<views::MenuRunner> menu_runner_; |
// Controls the visual feedback for the button state. |
- scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; |
+ std::unique_ptr<views::InkDropDelegate> ink_drop_delegate_; |
// A factory for tasks that show the dropdown context menu for the button. |
base::WeakPtrFactory<ToolbarButton> show_menu_factory_; |