chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h - Issue 17593006: mac: Update clients of scoped_nsobject.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h

diff --git a/chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h b/chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h

index 2cfa36bed55a5c49e43e439a72ed7fa9e45e9653..4a7f08219504869cf05a5c719d7dbbb3ad3e2f1a 100644

--- a/chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h

+++ b/chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h

@@ -7,7 +7,7 @@

#import <Cocoa/Cocoa.h>

-#include "base/memory/scoped_nsobject.h"

+#include "base/mac/scoped_nsobject.h"

#include "base/memory/scoped_ptr.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"

@@ -40,7 +40,7 @@ class OneClickSigninDialogController : public ConstrainedWindowMacDelegate {

void PerformClose();

scoped_ptr<ConstrainedWindowMac> constrained_window_;

- scoped_nsobject<OneClickSigninViewController> view_controller_;

+ base::scoped_nsobject<OneClickSigninViewController> view_controller_;

};

#endif // CHROME_BROWSER_UI_COCOA_ONE_CLICK_SIGNIN_DIALOG_CONTROLLER_H_