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

Unified Diff: chrome/browser/ui/cocoa/one_click_signin_view_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/one_click_signin_view_controller.h
diff --git a/chrome/browser/ui/cocoa/one_click_signin_view_controller.h b/chrome/browser/ui/cocoa/one_click_signin_view_controller.h
index 004ed3487cc688a18baf670169605a0f4638656a..02d71ae6e18dea08f5e50c8d68ee2fb2b7198c97 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_view_controller.h
+++ b/chrome/browser/ui/cocoa/one_click_signin_view_controller.h
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#include "base/callback.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "chrome/browser/ui/browser_window.h"
@class BrowserWindowController;
@@ -31,13 +31,13 @@ class WebContents;
// This is YES if the user clicked the Learn More link before another action.
BOOL clickedLearnMore_;
- scoped_nsobject<NSString> errorMessage_;
+ base::scoped_nsobject<NSString> errorMessage_;
// Text fields don't work as well with embedded links as text views, but
// text views cannot conveniently be created in IB. The xib file contains
// a text field |informativePlaceholderTextField_| that's replaced by this
// text view |promo_| in -awakeFromNib.
- scoped_nsobject<HyperlinkTextView> informativeTextView_;
+ base::scoped_nsobject<HyperlinkTextView> informativeTextView_;
BrowserWindow::StartSyncCallback startSyncCallback_;
base::Closure closeCallback_;
content::WebContents* webContents_;

Powered by Google App Engine
This is Rietveld 408576698