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

Side by Side Diff: ash/system/tray_update.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: address comments 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
« no previous file with comments | « ash/system/tray/tray_popup_label_button.cc ('k') | ash/system/user/user_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_SYSTEM_TRAY_UPDATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_UPDATE_H_
6 #define ASH_SYSTEM_TRAY_UPDATE_H_ 6 #define ASH_SYSTEM_TRAY_UPDATE_H_
7 7
8 #include <memory>
9
8 #include "ash/system/tray/system_tray_delegate.h" 10 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/system/tray/tray_image_item.h" 11 #include "ash/system/tray/tray_image_item.h"
10 #include "ash/system/user/update_observer.h" 12 #include "ash/system/user/update_observer.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 14
14 namespace views { 15 namespace views {
15 class View; 16 class View;
16 } 17 }
17 18
18 namespace ash { 19 namespace ash {
19 20
20 namespace tray { 21 namespace tray {
21 class UpdateNagger; 22 class UpdateNagger;
22 } 23 }
23 24
24 class TrayUpdate : public TrayImageItem, 25 class TrayUpdate : public TrayImageItem,
25 public UpdateObserver { 26 public UpdateObserver {
26 public: 27 public:
27 explicit TrayUpdate(SystemTray* system_tray); 28 explicit TrayUpdate(SystemTray* system_tray);
28 ~TrayUpdate() override; 29 ~TrayUpdate() override;
29 30
30 private: 31 private:
31 // Overridden from TrayImageItem. 32 // Overridden from TrayImageItem.
32 bool GetInitialVisibility() override; 33 bool GetInitialVisibility() override;
33 views::View* CreateDefaultView(user::LoginStatus status) override; 34 views::View* CreateDefaultView(user::LoginStatus status) override;
34 views::View* CreateDetailedView(user::LoginStatus status) override; 35 views::View* CreateDetailedView(user::LoginStatus status) override;
35 void DestroyDetailedView() override; 36 void DestroyDetailedView() override;
36 37
37 // Overridden from UpdateObserver. 38 // Overridden from UpdateObserver.
38 void OnUpdateRecommended(const UpdateInfo& info) override; 39 void OnUpdateRecommended(const UpdateInfo& info) override;
39 40
40 // Used to nag the user in case the tray has been hidden too long with an 41 // Used to nag the user in case the tray has been hidden too long with an
41 // unseen update notification. 42 // unseen update notification.
42 scoped_ptr<tray::UpdateNagger> nagger_; 43 std::unique_ptr<tray::UpdateNagger> nagger_;
43 44
44 DISALLOW_COPY_AND_ASSIGN(TrayUpdate); 45 DISALLOW_COPY_AND_ASSIGN(TrayUpdate);
45 }; 46 };
46 47
47 } // namespace ash 48 } // namespace ash
48 49
49 #endif // ASH_SYSTEM_TRAY_UPDATE_H_ 50 #endif // ASH_SYSTEM_TRAY_UPDATE_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_popup_label_button.cc ('k') | ash/system/user/user_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698