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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_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/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);
};

Powered by Google App Engine
This is Rietveld 408576698