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

Side by Side Diff: chrome/browser/ui/cocoa/profile_signin_confirmation_dialog_cocoa.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_PROFILE_SIGNIN_CONFIRMATION_DIALOG_COCOA_ 5 #ifndef CHROME_BROWSER_UI_COCOA_PROFILE_SIGNIN_CONFIRMATION_DIALOG_COCOA_
6 #define CHROME_BROWSER_UI_COCOA_PROFILE_SIGNIN_CONFIRMATION_DIALOG_COCOA_ 6 #define CHROME_BROWSER_UI_COCOA_PROFILE_SIGNIN_CONFIRMATION_DIALOG_COCOA_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/memory/scoped_nsobject.h" 14 #include "base/mac/scoped_nsobject.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" 17 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
18 #include "chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.h" 18 #include "chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.h"
19 19
20 class Browser; 20 class Browser;
21 class Profile; 21 class Profile;
22 22
23 namespace content { 23 namespace content {
24 class WebContents; 24 class WebContents;
(...skipping 17 matching lines...) Expand all
42 virtual ~ProfileSigninConfirmationDialogCocoa(); 42 virtual ~ProfileSigninConfirmationDialogCocoa();
43 43
44 // Closes the dialog, which deletes itself. 44 // Closes the dialog, which deletes itself.
45 void Close(); 45 void Close();
46 46
47 private: 47 private:
48 // ConstrainedWindowMacDelegate: 48 // ConstrainedWindowMacDelegate:
49 virtual void OnConstrainedWindowClosed(ConstrainedWindowMac* window) OVERRIDE; 49 virtual void OnConstrainedWindowClosed(ConstrainedWindowMac* window) OVERRIDE;
50 50
51 // Controller for the dialog view. 51 // Controller for the dialog view.
52 scoped_nsobject<ProfileSigninConfirmationViewController> controller_; 52 base::scoped_nsobject<ProfileSigninConfirmationViewController> controller_;
53 53
54 // The constrained window that contains the dialog view. 54 // The constrained window that contains the dialog view.
55 scoped_ptr<ConstrainedWindowMac> window_; 55 scoped_ptr<ConstrainedWindowMac> window_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(ProfileSigninConfirmationDialogCocoa); 57 DISALLOW_COPY_AND_ASSIGN(ProfileSigninConfirmationDialogCocoa);
58 }; 58 };
59 59
60 #endif // CHROME_BROWSER_UI_COCOA_PROFILE_SIGNIN_CONFIRMATION_DIALOG_COCOA_ 60 #endif // CHROME_BROWSER_UI_COCOA_PROFILE_SIGNIN_CONFIRMATION_DIALOG_COCOA_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698