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

Side by Side Diff: chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_PROFILES_PROFILE_SIGNIN_CONFIRMATION_DIALOG_COCO A_ 5 #ifndef CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_SIGNIN_CONFIRMATION_DIALOG_COCO A_
6 #define CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_SIGNIN_CONFIRMATION_DIALOG_COCO A_ 6 #define CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_SIGNIN_CONFIRMATION_DIALOG_COCO A_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <memory>
10 #include <string> 11 #include <string>
11 12
12 #include "base/callback.h" 13 #include "base/callback.h"
13 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
14 #include "base/mac/scoped_nsobject.h" 15 #include "base/mac/scoped_nsobject.h"
15 #include "base/macros.h" 16 #include "base/macros.h"
16 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
18 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" 18 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
19 #include "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_cont roller.h" 19 #include "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_cont roller.h"
20 20
21 class Browser; 21 class Browser;
22 class Profile; 22 class Profile;
23 23
24 namespace content { 24 namespace content {
25 class WebContents; 25 class WebContents;
26 } 26 }
(...skipping 26 matching lines...) Expand all
53 void Close(); 53 void Close();
54 54
55 private: 55 private:
56 // ConstrainedWindowMacDelegate: 56 // ConstrainedWindowMacDelegate:
57 void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override; 57 void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override;
58 58
59 // Controller for the dialog view. 59 // Controller for the dialog view.
60 base::scoped_nsobject<ProfileSigninConfirmationViewController> controller_; 60 base::scoped_nsobject<ProfileSigninConfirmationViewController> controller_;
61 61
62 // The constrained window that contains the dialog view. 62 // The constrained window that contains the dialog view.
63 scoped_ptr<ConstrainedWindowMac> window_; 63 std::unique_ptr<ConstrainedWindowMac> window_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(ProfileSigninConfirmationDialogCocoa); 65 DISALLOW_COPY_AND_ASSIGN(ProfileSigninConfirmationDialogCocoa);
66 }; 66 };
67 67
68 #endif // CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_SIGNIN_CONFIRMATION_DIALOG_C OCOA_ 68 #endif // CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_SIGNIN_CONFIRMATION_DIALOG_C OCOA_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698