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

Side by Side Diff: ash/system/chromeos/network/tray_vpn.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 unified diff | Download patch
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_CHROMEOS_NETWORK_TRAY_VPN_H 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
7 7
8 #include <memory>
9
8 #include "ash/system/chromeos/network/tray_network_state_observer.h" 10 #include "ash/system/chromeos/network/tray_network_state_observer.h"
9 #include "ash/system/tray/system_tray_item.h" 11 #include "ash/system/tray/system_tray_item.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 13
13 namespace ash { 14 namespace ash {
14 class TrayNetworkStateObserver; 15 class TrayNetworkStateObserver;
15 16
16 namespace tray { 17 namespace tray {
17 class NetworkDetailedView; 18 class NetworkDetailedView;
18 class VpnDefaultView; 19 class VpnDefaultView;
19 class VpnDetailedView; 20 class VpnDetailedView;
20 } 21 }
21 22
(...skipping 12 matching lines...) Expand all
34 void DestroyDetailedView() override; 35 void DestroyDetailedView() override;
35 void UpdateAfterLoginStatusChange(user::LoginStatus status) override; 36 void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
36 void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override; 37 void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
37 38
38 // TrayNetworkStateObserver::Delegate 39 // TrayNetworkStateObserver::Delegate
39 void NetworkStateChanged() override; 40 void NetworkStateChanged() override;
40 41
41 private: 42 private:
42 tray::VpnDefaultView* default_; 43 tray::VpnDefaultView* default_;
43 tray::NetworkDetailedView* detailed_; 44 tray::NetworkDetailedView* detailed_;
44 scoped_ptr<TrayNetworkStateObserver> network_state_observer_; 45 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_;
45 46
46 DISALLOW_COPY_AND_ASSIGN(TrayVPN); 47 DISALLOW_COPY_AND_ASSIGN(TrayVPN);
47 }; 48 };
48 49
49 } // namespace ash 50 } // namespace ash
50 51
51 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H 52 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698