| Index: ui/message_center/cocoa/popup_controller.mm
|
| diff --git a/ui/message_center/cocoa/popup_controller.mm b/ui/message_center/cocoa/popup_controller.mm
|
| index 496e08ac20b9c8b612a0b006cb4214551d33e5dc..30badc79bfe10baa78139c4263e9d5c43aa73d98 100644
|
| --- a/ui/message_center/cocoa/popup_controller.mm
|
| +++ b/ui/message_center/cocoa/popup_controller.mm
|
| @@ -97,12 +97,12 @@ enum {
|
| - (id)initWithNotification:(const message_center::Notification*)notification
|
| messageCenter:(message_center::MessageCenter*)messageCenter
|
| popupCollection:(MCPopupCollection*)popupCollection {
|
| - scoped_nsobject<MCPopupWindow> window(
|
| + base::scoped_nsobject<MCPopupWindow> window(
|
| [[MCPopupWindow alloc] initWithContentRect:ui::kWindowSizeDeterminedLater
|
| - styleMask:NSBorderlessWindowMask |
|
| - NSNonactivatingPanelMask
|
| - backing:NSBackingStoreBuffered
|
| - defer:YES]);
|
| + styleMask:NSBorderlessWindowMask |
|
| + NSNonactivatingPanelMask
|
| + backing:NSBackingStoreBuffered
|
| + defer:YES]);
|
| if ((self = [super initWithWindow:window])) {
|
| messageCenter_ = messageCenter;
|
| popupCollection_ = popupCollection;
|
|
|