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

Side by Side Diff: chrome/browser/ui/views/message_center/web_notification_tray.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_H_
6 #define CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_H_ 6 #define CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_H_
7 7
8 #include <memory>
9
8 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "ui/message_center/message_center_tray_delegate.h" 12 #include "ui/message_center/message_center_tray_delegate.h"
12 #include "ui/views/widget/widget_observer.h" 13 #include "ui/views/widget/widget_observer.h"
13 14
14 class StatusIcon; 15 class StatusIcon;
15 16
16 namespace message_center { 17 namespace message_center {
17 class DesktopPopupAlignmentDelegate; 18 class DesktopPopupAlignmentDelegate;
18 class MessageCenter; 19 class MessageCenter;
19 class MessageCenterTray; 20 class MessageCenterTray;
20 class MessagePopupCollection; 21 class MessagePopupCollection;
(...skipping 19 matching lines...) Expand all
40 bool IsContextMenuEnabled() const override; 41 bool IsContextMenuEnabled() const override;
41 42
42 MessageCenterTray* GetMessageCenterTray() override; 43 MessageCenterTray* GetMessageCenterTray() override;
43 44
44 private: 45 private:
45 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications); 46 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications);
46 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble); 47 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble);
47 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManyPopupNotifications); 48 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManyPopupNotifications);
48 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManuallyCloseMessageCenter); 49 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManuallyCloseMessageCenter);
49 50
50 scoped_ptr<MessagePopupCollection> popup_collection_; 51 std::unique_ptr<MessagePopupCollection> popup_collection_;
51 scoped_ptr<DesktopPopupAlignmentDelegate> alignment_delegate_; 52 std::unique_ptr<DesktopPopupAlignmentDelegate> alignment_delegate_;
52 53
53 scoped_ptr<MessageCenterTray> message_center_tray_; 54 std::unique_ptr<MessageCenterTray> message_center_tray_;
54 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); 55 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
55 }; 56 };
56 57
57 } // namespace message_center 58 } // namespace message_center
58 59
59 #endif // CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_H_ 60 #endif // CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698