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. |