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

Side by Side Diff: chrome/browser/ui/cocoa/one_click_signin_dialog_controller.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 (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 "base/memory/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "chrome/browser/ui/browser_window.h" 12 #include "chrome/browser/ui/browser_window.h"
13 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" 13 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
14 14
15 namespace content { 15 namespace content {
16 class WebContents; 16 class WebContents;
17 } 17 }
18 @class OneClickSigninViewController; 18 @class OneClickSigninViewController;
19 19
20 // After the user signs into chrome this class is used to display a tab modal 20 // After the user signs into chrome this class is used to display a tab modal
(...skipping 12 matching lines...) Expand all
33 ConstrainedWindowMac* constrained_window() const { 33 ConstrainedWindowMac* constrained_window() const {
34 return constrained_window_.get(); 34 return constrained_window_.get();
35 } 35 }
36 36
37 OneClickSigninViewController* view_controller() { return view_controller_; } 37 OneClickSigninViewController* view_controller() { return view_controller_; }
38 38
39 private: 39 private:
40 void PerformClose(); 40 void PerformClose();
41 41
42 scoped_ptr<ConstrainedWindowMac> constrained_window_; 42 scoped_ptr<ConstrainedWindowMac> constrained_window_;
43 scoped_nsobject<OneClickSigninViewController> view_controller_; 43 base::scoped_nsobject<OneClickSigninViewController> view_controller_;
44 }; 44 };
45 45
46 #endif // CHROME_BROWSER_UI_COCOA_ONE_CLICK_SIGNIN_DIALOG_CONTROLLER_H_ 46 #endif // CHROME_BROWSER_UI_COCOA_ONE_CLICK_SIGNIN_DIALOG_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698