OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_ONE_CLICK_SIGNIN_DIALOG_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_ONE_CLICK_SIGNIN_DIALOG_CONTROLLER_H_ |
6 #define CHROME_BROWSER_UI_COCOA_ONE_CLICK_SIGNIN_DIALOG_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_COCOA_ONE_CLICK_SIGNIN_DIALOG_CONTROLLER_H_ |
7 | 7 |
8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
9 | 9 |
| 10 #include <memory> |
| 11 |
10 #include "base/mac/scoped_nsobject.h" | 12 #include "base/mac/scoped_nsobject.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.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 | 15 |
15 namespace content { | 16 namespace content { |
16 class WebContents; | 17 class WebContents; |
17 } | 18 } |
18 @class OneClickSigninViewController; | 19 @class OneClickSigninViewController; |
19 | 20 |
20 // After the user signs into chrome this class is used to display a tab modal | 21 // After the user signs into chrome this class is used to display a tab modal |
21 // signin confirmation dialog. | 22 // signin confirmation dialog. |
(...skipping 13 matching lines...) Expand all Loading... |
35 | 36 |
36 ConstrainedWindowMac* constrained_window() const { | 37 ConstrainedWindowMac* constrained_window() const { |
37 return constrained_window_.get(); | 38 return constrained_window_.get(); |
38 } | 39 } |
39 | 40 |
40 OneClickSigninViewController* view_controller() { return view_controller_; } | 41 OneClickSigninViewController* view_controller() { return view_controller_; } |
41 | 42 |
42 private: | 43 private: |
43 void PerformClose(); | 44 void PerformClose(); |
44 | 45 |
45 scoped_ptr<ConstrainedWindowMac> constrained_window_; | 46 std::unique_ptr<ConstrainedWindowMac> constrained_window_; |
46 base::scoped_nsobject<OneClickSigninViewController> view_controller_; | 47 base::scoped_nsobject<OneClickSigninViewController> view_controller_; |
47 }; | 48 }; |
48 | 49 |
49 #endif // CHROME_BROWSER_UI_COCOA_ONE_CLICK_SIGNIN_DIALOG_CONTROLLER_H_ | 50 #endif // CHROME_BROWSER_UI_COCOA_ONE_CLICK_SIGNIN_DIALOG_CONTROLLER_H_ |
OLD | NEW |