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

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h

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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_COCOA_TOOLBAR_APP_TOOLBAR_BUTTON_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_TOOLBAR_APP_TOOLBAR_BUTTON_H_
6 #define CHROME_BROWSER_UI_COCOA_TOOLBAR_APP_TOOLBAR_BUTTON_H_ 6 #define CHROME_BROWSER_UI_COCOA_TOOLBAR_APP_TOOLBAR_BUTTON_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include <memory>
11
11 #import "chrome/browser/ui/cocoa/menu_button.h" 12 #import "chrome/browser/ui/cocoa/menu_button.h"
12 #include "chrome/browser/ui/toolbar/app_menu_icon_painter.h" 13 #include "chrome/browser/ui/toolbar/app_menu_icon_painter.h"
13 14
14 class AppMenuButtonIconPainterDelegateMac; 15 class AppMenuButtonIconPainterDelegateMac;
15 16
16 // Button for the app toolbar button. 17 // Button for the app toolbar button.
17 @interface AppToolbarButton : MenuButton { 18 @interface AppToolbarButton : MenuButton {
18 @private 19 @private
19 scoped_ptr<AppMenuButtonIconPainterDelegateMac> delegate_; 20 std::unique_ptr<AppMenuButtonIconPainterDelegateMac> delegate_;
20 AppMenuIconPainter::Severity severity_; 21 AppMenuIconPainter::Severity severity_;
21 } 22 }
22 23
23 - (void)setSeverity:(AppMenuIconPainter::Severity)severity 24 - (void)setSeverity:(AppMenuIconPainter::Severity)severity
24 shouldAnimate:(BOOL)shouldAnimate; 25 shouldAnimate:(BOOL)shouldAnimate;
25 26
26 @end 27 @end
27 28
28 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_APP_TOOLBAR_BUTTON_H_ 29 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_APP_TOOLBAR_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698