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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // MediaGalleriesDialog implementation: 62 // MediaGalleriesDialog implementation:
63 void AcceptDialogForTesting() override; 63 void AcceptDialogForTesting() override;
64 64
65 void InitDialogControls(); 65 void InitDialogControls();
66 CGFloat CreateCheckboxes( 66 CGFloat CreateCheckboxes(
67 CGFloat y_pos, 67 CGFloat y_pos,
68 const MediaGalleriesDialogController::Entries& entries); 68 const MediaGalleriesDialogController::Entries& entries);
69 CGFloat CreateCheckboxSeparator(CGFloat y_pos, NSString* header); 69 CGFloat CreateCheckboxSeparator(CGFloat y_pos, NSString* header);
70 70
71 MediaGalleriesDialogController* controller_; // weak 71 MediaGalleriesDialogController* controller_; // weak
72 scoped_ptr<ConstrainedWindowMac> window_; 72 std::unique_ptr<ConstrainedWindowMac> window_;
73 73
74 // The alert that the dialog is being displayed as. 74 // The alert that the dialog is being displayed as.
75 base::scoped_nsobject<ConstrainedWindowAlert> alert_; 75 base::scoped_nsobject<ConstrainedWindowAlert> alert_;
76 76
77 // True if the user has pressed accept. 77 // True if the user has pressed accept.
78 bool accepted_; 78 bool accepted_;
79 79
80 // Container view for checkboxes. 80 // Container view for checkboxes.
81 base::scoped_nsobject<NSView> checkbox_container_; 81 base::scoped_nsobject<NSView> checkbox_container_;
82 82
83 // Container view for the main dialog contents. 83 // Container view for the main dialog contents.
84 base::scoped_nsobject<NSBox> main_container_; 84 base::scoped_nsobject<NSBox> main_container_;
85 85
86 // An Objective-C class to route callbacks from Cocoa code. 86 // An Objective-C class to route callbacks from Cocoa code.
87 base::scoped_nsobject<MediaGalleriesCocoaController> cocoa_controller_; 87 base::scoped_nsobject<MediaGalleriesCocoaController> cocoa_controller_;
88 88
89 DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogCocoa); 89 DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogCocoa);
90 }; 90 };
91 91
92 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_ 92 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698