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

Unified Diff: chrome/browser/ui/views/toolbar/chevron_menu_button.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/toolbar/chevron_menu_button.cc
diff --git a/chrome/browser/ui/views/toolbar/chevron_menu_button.cc b/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
index 719b036364d8c9617d415738ce3ca189dd6d6053..b67622d9ca02fbffd20b3ffcc83a2f4c726c1788 100644
--- a/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
+++ b/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
@@ -135,7 +135,7 @@ class ChevronMenuButton::MenuController : public views::MenuDelegate {
views::MenuItemView* menu_;
// Resposible for running the menu.
- scoped_ptr<views::MenuRunner> menu_runner_;
+ std::unique_ptr<views::MenuRunner> menu_runner_;
// The index into the ToolbarActionView vector, indicating where to start
// picking browser actions to draw.
@@ -230,7 +230,7 @@ bool ChevronMenuButton::MenuController::ShowContextMenu(
if (!view_controller->extension()->ShowConfigureContextMenus())
return false;
- scoped_ptr<extensions::ExtensionContextMenuModel> context_menu_contents(
+ std::unique_ptr<extensions::ExtensionContextMenuModel> context_menu_contents(
new extensions::ExtensionContextMenuModel(
view_controller->extension(), view_controller->browser(),
extensions::ExtensionContextMenuModel::OVERFLOWED, view_controller));
@@ -377,10 +377,10 @@ void ChevronMenuButton::CloseMenu() {
menu_controller_->CloseMenu();
}
-scoped_ptr<views::LabelButtonBorder> ChevronMenuButton::CreateDefaultBorder()
- const {
+std::unique_ptr<views::LabelButtonBorder>
+ChevronMenuButton::CreateDefaultBorder() const {
// The chevron resource was designed to not have any insets.
- scoped_ptr<views::LabelButtonBorder> border =
+ std::unique_ptr<views::LabelButtonBorder> border =
views::MenuButton::CreateDefaultBorder();
border->set_insets(gfx::Insets());
return border;

Powered by Google App Engine
This is Rietveld 408576698