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

Side by Side Diff: chrome/browser/chromeos/net/wake_on_wifi_manager.h

Issue 1870793002: Convert //chrome/browser/chromeos 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CHROMEOS_NET_WAKE_ON_WIFI_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_NET_WAKE_ON_WIFI_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_NET_WAKE_ON_WIFI_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_NET_WAKE_ON_WIFI_MANAGER_H_
7 7
8 #include <memory>
9
8 #include "base/containers/scoped_ptr_hash_map.h" 10 #include "base/containers/scoped_ptr_hash_map.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
12 #include "chrome/browser/chromeos/power/extension_event_observer.h" 13 #include "chrome/browser/chromeos/power/extension_event_observer.h"
13 #include "chromeos/network/network_state_handler_observer.h" 14 #include "chromeos/network/network_state_handler_observer.h"
14 #include "content/public/browser/notification_observer.h" 15 #include "content/public/browser/notification_observer.h"
15 #include "content/public/browser/notification_registrar.h" 16 #include "content/public/browser/notification_registrar.h"
16 17
17 class Profile; 18 class Profile;
18 19
19 namespace base { 20 namespace base {
20 class DictionaryValue; 21 class DictionaryValue;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void OnProfileAdded(Profile* profile); 80 void OnProfileAdded(Profile* profile);
80 void OnProfileDestroyed(Profile* profile); 81 void OnProfileDestroyed(Profile* profile);
81 82
82 WakeOnWifiFeature current_feature_; 83 WakeOnWifiFeature current_feature_;
83 84
84 // Set to true once we have received the properties for the wifi device from 85 // Set to true once we have received the properties for the wifi device from
85 // shill. 86 // shill.
86 bool wifi_properties_received_; 87 bool wifi_properties_received_;
87 88
88 class WakeOnPacketConnectionObserver; 89 class WakeOnPacketConnectionObserver;
89 base::ScopedPtrHashMap<Profile*, scoped_ptr<WakeOnPacketConnectionObserver>> 90 base::ScopedPtrHashMap<Profile*,
91 std::unique_ptr<WakeOnPacketConnectionObserver>>
90 connection_observers_; 92 connection_observers_;
91 93
92 scoped_ptr<ExtensionEventObserver> extension_event_observer_; 94 std::unique_ptr<ExtensionEventObserver> extension_event_observer_;
93 95
94 content::NotificationRegistrar registrar_; 96 content::NotificationRegistrar registrar_;
95 97
96 base::WeakPtrFactory<WakeOnWifiManager> weak_ptr_factory_; 98 base::WeakPtrFactory<WakeOnWifiManager> weak_ptr_factory_;
97 99
98 DISALLOW_COPY_AND_ASSIGN(WakeOnWifiManager); 100 DISALLOW_COPY_AND_ASSIGN(WakeOnWifiManager);
99 }; 101 };
100 102
101 } // namespace chromeos 103 } // namespace chromeos
102 104
103 #endif // CHROME_BROWSER_CHROMEOS_NET_WAKE_ON_WIFI_MANAGER_H_ 105 #endif // CHROME_BROWSER_CHROMEOS_NET_WAKE_ON_WIFI_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/net/proxy_config_handler.cc ('k') | chrome/browser/chromeos/net/wake_on_wifi_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698