| Index: chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h
|
| diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h
|
| index f3f77f4eca2e6c3bde86922c8ad880b9ffd6396e..b0eb8f0b618bfed1f30c03165fbd83f51a22e345 100644
|
| --- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h
|
| +++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_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"
|
| #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
|
| #import "ui/base/cocoa/tracking_area.h"
|
| @@ -23,7 +23,7 @@ class Browser;
|
| scoped_ptr<AvatarMenuModel> model_;
|
|
|
| // Array of the below view controllers.
|
| - scoped_nsobject<NSMutableArray> items_;
|
| + base::scoped_nsobject<NSMutableArray> items_;
|
|
|
| // Is set to true if the managed user has clicked on Switch Users.
|
| BOOL expanded_;
|
| @@ -65,7 +65,7 @@ class Browser;
|
|
|
| // The animation showing the edit link, which is run after the user has
|
| // dwelled over the item for a short delay.
|
| - scoped_nsobject<NSAnimation> linkAnimation_;
|
| + base::scoped_nsobject<NSAnimation> linkAnimation_;
|
|
|
| // Instance variables that back the outlets.
|
| __weak NSImageView* iconView_;
|
|
|