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

Unified Diff: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.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/ssl_client_certificate_selector_cocoa.h
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h
index 49b080c0941ad7035a34fbc9019ed7db720c6a48..ce94e3c48eb1d7a09f7ac62bdf63b41ac81b2591 100644
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h
@@ -9,8 +9,8 @@
#include <vector>
#include "base/mac/scoped_cftyperef.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/ssl/ssl_client_certificate_selector.h"
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
@@ -29,9 +29,9 @@ class SSLClientAuthObserverCocoaBridge;
std::vector<scoped_refptr<net::X509Certificate> > certificates_;
// A C++ object to bridge SSLClientAuthObserver notifications to us.
scoped_ptr<SSLClientAuthObserverCocoaBridge> observer_;
- scoped_nsobject<SFChooseIdentityPanel> panel_;
+ base::scoped_nsobject<SFChooseIdentityPanel> 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