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

Unified Diff: chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.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/location_bar/autocomplete_text_field.h
diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h
index a54e788afbb7b12a5434c8886f45a786fb2bbe3f..eadb2173870e03d67aa06157fde4adbfbd6857b8 100644
--- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h
+++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/styled_text_field.h"
#import "chrome/browser/ui/cocoa/url_drop_target.h"
@@ -113,18 +113,18 @@ class AutocompleteTextFieldObserver {
@private
// Undo manager for this text field. We use a specific instance rather than
// the standard undo manager in order to let us clear the undo stack at will.
- scoped_nsobject<NSUndoManager> undoManager_;
+ base::scoped_nsobject<NSUndoManager> undoManager_;
AutocompleteTextFieldObserver* observer_; // weak, owned by location bar.
// Handles being a drag-and-drop target.
- scoped_nsobject<URLDropTargetHandler> dropHandler_;
+ base::scoped_nsobject<URLDropTargetHandler> dropHandler_;
// Holds current tooltip strings, to keep them from being dealloced.
- scoped_nsobject<NSMutableArray> currentToolTips_;
+ base::scoped_nsobject<NSMutableArray> currentToolTips_;
- scoped_nsobject<NSString> suggestText_;
- scoped_nsobject<NSColor> suggestColor_;
+ base::scoped_nsobject<NSString> suggestText_;
+ base::scoped_nsobject<NSColor> suggestColor_;
}
@property(nonatomic) AutocompleteTextFieldObserver* observer;

Powered by Google App Engine
This is Rietveld 408576698