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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanups 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_bridge_unittest.mm ('K') | « chrome/browser/ui/cocoa/task_manager_mac_unittest.mm ('k') | chrome/browser/ui/cocoa/toolbar/reload_button_unittest.mm » ('j') | chrome/common/mac/objc_method_swizzle.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h
diff --git a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h
index 282ff7720ea0fd8354d88563cc2bedb6742fe1a9..e1863415f920142fb990520a65f88c18bcff9449 100644
--- a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h
+++ b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
@@ -27,7 +27,7 @@ const BackForwardMenuType BACK_FORWARD_MENU_TYPE_FORWARD =
BackForwardMenuType type_;
MenuButton* button_; // Weak; comes from nib.
scoped_ptr<BackForwardMenuModel> model_;
- scoped_nsobject<NSMenu> backForwardMenu_;
+ base::scoped_nsobject<NSMenu> backForwardMenu_;
}
// Type (back or forwards); can only be set on initialization.
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm ('K') | « chrome/browser/ui/cocoa/task_manager_mac_unittest.mm ('k') | chrome/browser/ui/cocoa/toolbar/reload_button_unittest.mm » ('j') | chrome/common/mac/objc_method_swizzle.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698