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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/history_overlay_controller.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
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/history_overlay_controller.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/history_overlay_controller.h
diff --git a/chrome/browser/ui/cocoa/history_overlay_controller.h b/chrome/browser/ui/cocoa/history_overlay_controller.h
index 3a83a2625b78e5769871afd128cb3db404eec622..541b2f24119aff9546c1f3730b08b0652b993d9e 100644
--- a/chrome/browser/ui/cocoa/history_overlay_controller.h
+++ b/chrome/browser/ui/cocoa/history_overlay_controller.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
@class HistoryOverlayView;
@@ -23,9 +23,9 @@ enum HistoryOverlayMode {
@private
HistoryOverlayMode mode_;
// Strongly typed reference of self.view.
- scoped_nsobject<HistoryOverlayView> contentView_;
+ base::scoped_nsobject<HistoryOverlayView> contentView_;
// The view above which self.view is inserted as a subview.
- scoped_nsobject<NSView> parent_;
+ base::scoped_nsobject<NSView> parent_;
}
// Designated initializer.
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/history_overlay_controller.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698