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

Unified Diff: chrome/browser/ui/cocoa/certificate_viewer_mac.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/certificate_viewer_mac.h
diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac.h b/chrome/browser/ui/cocoa/certificate_viewer_mac.h
index 737d40dd6a887e1ce7d2f73495d603489f19e4b2..f33bef2d5db39ae35258f0dcf874b820ef831351 100644
--- a/chrome/browser/ui/cocoa/certificate_viewer_mac.h
+++ b/chrome/browser/ui/cocoa/certificate_viewer_mac.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"
@@ -21,11 +21,11 @@ namespace net {
@interface SSLCertificateViewerCocoa : NSObject<ConstrainedWindowSheet> {
@private
// The corresponding list of certificates.
- scoped_nsobject<NSArray> certificates_;
+ base::scoped_nsobject<NSArray> certificates_;
scoped_ptr<SSLCertificateViewerCocoaBridge> observer_;
- scoped_nsobject<SFCertificatePanel> panel_;
+ base::scoped_nsobject<SFCertificatePanel> panel_;
scoped_ptr<ConstrainedWindowMac> constrainedWindow_;
- scoped_nsobject<NSWindow> overlayWindow_;
+ base::scoped_nsobject<NSWindow> overlayWindow_;
BOOL closePending_;
// A copy of the sheet's frame used to restore on show.
NSRect oldSheetFrame_;

Powered by Google App Engine
This is Rietveld 408576698