| Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h
|
| diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h
|
| index 629d572e9e20d616773a7324dea7c4d9c0f8ad42..7271416a329f09a796f9b60e602652deed9ab0c9 100644
|
| --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h
|
| +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h
|
| @@ -8,7 +8,7 @@
|
| #import <Cocoa/Cocoa.h>
|
|
|
| #include "base/basictypes.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/autocomplete/autocomplete_match.h"
|
| #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
|
| @@ -126,10 +126,10 @@ class OmniboxPopupViewMac : public OmniboxPopupView {
|
| NSTextField* field_; // owned by tab controller
|
|
|
| // Child window containing a matrix which implements the popup.
|
| - scoped_nsobject<NSWindow> popup_;
|
| + base::scoped_nsobject<NSWindow> popup_;
|
| NSRect targetPopupFrame_;
|
|
|
| - scoped_nsobject<AutocompleteMatrix> autocomplete_matrix_;
|
| + base::scoped_nsobject<AutocompleteMatrix> autocomplete_matrix_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(OmniboxPopupViewMac);
|
| };
|
|
|