Index: chrome/browser/ui/cocoa/notifications/balloon_controller.h |
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.h b/chrome/browser/ui/cocoa/notifications/balloon_controller.h |
index c63caede720b069ecbb5e9f3029bfa1a30e69f8a..7c9c00a312bc8c2870ed2ba11c72f844c45a5c89 100644 |
--- a/chrome/browser/ui/cocoa/notifications/balloon_controller.h |
+++ b/chrome/browser/ui/cocoa/notifications/balloon_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" |
class Balloon; |
@@ -46,7 +46,7 @@ class NotificationOptionsMenuModel; |
// The options menu that appears when "options" is pressed. |
IBOutlet HoverImageButton* optionsButton_; |
scoped_ptr<NotificationOptionsMenuModel> menuModel_; |
- scoped_nsobject<MenuController> menuController_; |
+ base::scoped_nsobject<MenuController> menuController_; |
// The host for the renderer of the HTML contents. |
scoped_ptr<BalloonViewHost> htmlContents_; |