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

Side by Side Diff: ash/system/chromeos/network/tray_network.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
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_NETWORK_H 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
7 7
8 #include <memory>
8 #include <set> 9 #include <set>
9 10
10 #include "ash/system/chromeos/network/network_observer.h" 11 #include "ash/system/chromeos/network/network_observer.h"
11 #include "ash/system/chromeos/network/network_portal_detector_observer.h" 12 #include "ash/system/chromeos/network/network_portal_detector_observer.h"
12 #include "ash/system/chromeos/network/tray_network_state_observer.h" 13 #include "ash/system/chromeos/network/tray_network_state_observer.h"
13 #include "ash/system/tray/system_tray_item.h" 14 #include "ash/system/tray/system_tray_item.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 17
18 namespace chromeos { 18 namespace chromeos {
19 class NetworkState; 19 class NetworkState;
20 } 20 }
21 21
22 namespace ash { 22 namespace ash {
23 namespace tray { 23 namespace tray {
24 class NetworkDefaultView; 24 class NetworkDefaultView;
25 class NetworkDetailedView; 25 class NetworkDetailedView;
(...skipping 27 matching lines...) Expand all
53 void OnCaptivePortalDetected(const std::string& service_path) override; 53 void OnCaptivePortalDetected(const std::string& service_path) override;
54 54
55 // TrayNetworkStateObserver::Delegate 55 // TrayNetworkStateObserver::Delegate
56 void NetworkStateChanged() override; 56 void NetworkStateChanged() override;
57 57
58 private: 58 private:
59 tray::NetworkTrayView* tray_; 59 tray::NetworkTrayView* tray_;
60 tray::NetworkDefaultView* default_; 60 tray::NetworkDefaultView* default_;
61 tray::NetworkDetailedView* detailed_; 61 tray::NetworkDetailedView* detailed_;
62 bool request_wifi_view_; 62 bool request_wifi_view_;
63 scoped_ptr<TrayNetworkStateObserver> network_state_observer_; 63 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); 65 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
66 }; 66 };
67 67
68 } // namespace ash 68 } // namespace ash
69 69
70 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H 70 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/system/chromeos/network/tray_vpn.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698