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

Unified Diff: chrome/browser/ui/views/toolbar/app_menu.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
« no previous file with comments | « chrome/browser/ui/views/toolbar/app_menu.h ('k') | chrome/browser/ui/views/toolbar/app_menu_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/app_menu.cc
diff --git a/chrome/browser/ui/views/toolbar/app_menu.cc b/chrome/browser/ui/views/toolbar/app_menu.cc
index 0a740c3cae693a957067a6b24fa4bd747a257d9b..5cee86832ae3396e4b4c76212220bbd13796c8b4 100644
--- a/chrome/browser/ui/views/toolbar/app_menu.cc
+++ b/chrome/browser/ui/views/toolbar/app_menu.cc
@@ -716,7 +716,8 @@ class AppMenu::ZoomView : public AppMenuView {
// Index of the fullscreen menu item in the model.
const int fullscreen_index_;
- scoped_ptr<content::HostZoomMap::Subscription> browser_zoom_subscription_;
+ std::unique_ptr<content::HostZoomMap::Subscription>
+ browser_zoom_subscription_;
content::NotificationRegistrar registrar_;
// Button for incrementing the zoom.
@@ -1152,7 +1153,7 @@ void AppMenu::PopulateMenu(MenuItemView* parent, MenuModel* model) {
switch (model->GetCommandIdAt(i)) {
case IDC_EXTENSIONS_OVERFLOW_MENU: {
- scoped_ptr<ExtensionToolbarMenuView> extension_toolbar(
+ std::unique_ptr<ExtensionToolbarMenuView> extension_toolbar(
new ExtensionToolbarMenuView(browser_, this, item));
if (ui::MaterialDesignController::IsModeMaterial()) {
for (int i = 0; i < extension_toolbar->contents()->child_count();
« no previous file with comments | « chrome/browser/ui/views/toolbar/app_menu.h ('k') | chrome/browser/ui/views/toolbar/app_menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698