Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2820)

Unified Diff: ash/system/web_notification/web_notification_tray.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/web_notification/web_notification_tray.h
diff --git a/ash/system/web_notification/web_notification_tray.h b/ash/system/web_notification/web_notification_tray.h
index 358b02a089e8a3240f8bd6b9955ab28071c7a391..2e12dc11061a502e36206ce6799994e7b8ebe696 100644
--- a/ash/system/web_notification/web_notification_tray.h
+++ b/ash/system/web_notification/web_notification_tray.h
@@ -5,12 +5,13 @@
#ifndef ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
#define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
+#include <memory>
+
#include "ash/ash_export.h"
#include "ash/system/tray/tray_background_view.h"
#include "ash/system/user/login_status.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ui/base/models/simple_menu_model.h"
#include "ui/message_center/message_center_tray.h"
@@ -157,9 +158,9 @@ class ASH_EXPORT WebNotificationTray
bool IsPopupVisible() const;
message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
- scoped_ptr<message_center::MessageCenterTray> message_center_tray_;
- scoped_ptr<WebNotificationBubbleWrapper> message_center_bubble_;
- scoped_ptr<message_center::MessagePopupCollection> popup_collection_;
+ std::unique_ptr<message_center::MessageCenterTray> message_center_tray_;
+ std::unique_ptr<WebNotificationBubbleWrapper> message_center_bubble_;
+ std::unique_ptr<message_center::MessagePopupCollection> popup_collection_;
WebNotificationButton* button_;
bool show_message_center_on_unlock_;
@@ -172,7 +173,7 @@ class ASH_EXPORT WebNotificationTray
// flickers of the shelf from hidden to shown. See: crbug.com/181213
bool should_block_shelf_auto_hide_;
- scoped_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;
+ std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;
DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
};

Powered by Google App Engine
This is Rietveld 408576698