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

Side by Side Diff: chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_TAB_MODAL_CONFIRM_DIALOG_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_TAB_MODAL_CONFIRM_DIALOG_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_TAB_MODAL_CONFIRM_DIALOG_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_TAB_MODAL_CONFIRM_DIALOG_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <memory>
11
10 #import "base/mac/scoped_nsobject.h" 12 #import "base/mac/scoped_nsobject.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" 14 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
14 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" 15 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
15 16
16 @class ConstrainedWindowAlert; 17 @class ConstrainedWindowAlert;
17 18
18 namespace content { 19 namespace content {
19 class WebContents; 20 class WebContents;
20 } 21 }
21 22
22 class TabModalConfirmDialogDelegate; 23 class TabModalConfirmDialogDelegate;
(...skipping 18 matching lines...) Expand all
41 void CancelTabModalDialog() override; 42 void CancelTabModalDialog() override;
42 43
43 // TabModalConfirmDialogCloseDelegate: 44 // TabModalConfirmDialogCloseDelegate:
44 void CloseDialog() override; 45 void CloseDialog() override;
45 46
46 // ConstrainedWindowMacDelegate: 47 // ConstrainedWindowMacDelegate:
47 void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override; 48 void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override;
48 49
49 bool closing_; 50 bool closing_;
50 51
51 scoped_ptr<ConstrainedWindowMac> window_; 52 std::unique_ptr<ConstrainedWindowMac> window_;
52 scoped_ptr<TabModalConfirmDialogDelegate> delegate_; 53 std::unique_ptr<TabModalConfirmDialogDelegate> delegate_;
53 base::scoped_nsobject<ConstrainedWindowAlert> alert_; 54 base::scoped_nsobject<ConstrainedWindowAlert> alert_;
54 base::scoped_nsobject<TabModalConfirmDialogMacBridge> bridge_; 55 base::scoped_nsobject<TabModalConfirmDialogMacBridge> bridge_;
55 56
56 DISALLOW_COPY_AND_ASSIGN(TabModalConfirmDialogMac); 57 DISALLOW_COPY_AND_ASSIGN(TabModalConfirmDialogMac);
57 }; 58 };
58 59
59 #endif // CHROME_BROWSER_UI_COCOA_TAB_MODAL_CONFIRM_DIALOG_MAC_H_ 60 #endif // CHROME_BROWSER_UI_COCOA_TAB_MODAL_CONFIRM_DIALOG_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tab_dialogs_cocoa.mm ('k') | chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698