| Index: chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
|
| diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
|
| index 8301adb83c619fa4b432695f7efeb91eca88364e..bfecc0d52a4c93b55af02a865cec6d321854bca7 100644
|
| --- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
|
| +++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
|
| @@ -7,9 +7,10 @@
|
|
|
| #import <AppKit/AppKit.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/mac/scoped_nsobject.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "components/prefs/pref_member.h"
|
| #include "ui/message_center/message_center.h"
|
| @@ -51,7 +52,7 @@ class MessageCenterTrayBridge :
|
| message_center::MessageCenter* message_center_;
|
|
|
| // C++ controller for the notification tray UI.
|
| - scoped_ptr<message_center::MessageCenterTray> tray_;
|
| + std::unique_ptr<message_center::MessageCenterTray> tray_;
|
|
|
| // Obj-C controller for the on-screen popup notifications.
|
| base::scoped_nsobject<MCPopupCollection> popup_collection_;
|
|
|