Index: chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h |
diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h |
index 1943ae8f2e9b950d83cf5621873d15fcc5b86782..cf2c5b3f94c027246b1793e45b00deae9979ae9c 100644 |
--- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h |
+++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h |
@@ -4,7 +4,7 @@ |
#import <Cocoa/Cocoa.h> |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#import "chrome/browser/ui/cocoa/url_drop_target.h" |
@class AutocompleteTextField; |
@@ -23,9 +23,9 @@ class AutocompleteTextFieldObserver; |
// allowing the |AutocompletTextField| to handle it (by making an empty |
// |-updateDragTypeRegistration|), since the latter results in a weird |
// start-up time regression. |
- scoped_nsobject<URLDropTargetHandler> dropHandler_; |
+ base::scoped_nsobject<URLDropTargetHandler> dropHandler_; |
- scoped_nsobject<NSCharacterSet> forbiddenCharacters_; |
+ base::scoped_nsobject<NSCharacterSet> forbiddenCharacters_; |
// Indicates if the field editor's interpretKeyEvents: method is being called. |
// If it's YES, then we should postpone the call to the observer's |