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

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

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build after rebase Created 5 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 "base/containers/scoped_ptr_hash_map.h" 8 #include "base/containers/scoped_ptr_hash_map.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void OnProfileAdded(Profile* profile); 79 void OnProfileAdded(Profile* profile);
80 void OnProfileDestroyed(Profile* profile); 80 void OnProfileDestroyed(Profile* profile);
81 81
82 WakeOnWifiFeature current_feature_; 82 WakeOnWifiFeature current_feature_;
83 83
84 // Set to true once we have received the properties for the wifi device from 84 // Set to true once we have received the properties for the wifi device from
85 // shill. 85 // shill.
86 bool wifi_properties_received_; 86 bool wifi_properties_received_;
87 87
88 class WakeOnPacketConnectionObserver; 88 class WakeOnPacketConnectionObserver;
89 base::ScopedPtrHashMap<Profile*, WakeOnPacketConnectionObserver> 89 base::ScopedPtrHashMap<Profile*, scoped_ptr<WakeOnPacketConnectionObserver>>
90 connection_observers_; 90 connection_observers_;
91 91
92 scoped_ptr<ExtensionEventObserver> extension_event_observer_; 92 scoped_ptr<ExtensionEventObserver> extension_event_observer_;
93 93
94 content::NotificationRegistrar registrar_; 94 content::NotificationRegistrar registrar_;
95 95
96 base::WeakPtrFactory<WakeOnWifiManager> weak_ptr_factory_; 96 base::WeakPtrFactory<WakeOnWifiManager> weak_ptr_factory_;
97 97
98 DISALLOW_COPY_AND_ASSIGN(WakeOnWifiManager); 98 DISALLOW_COPY_AND_ASSIGN(WakeOnWifiManager);
99 }; 99 };
100 100
101 } // namespace chromeos 101 } // namespace chromeos
102 102
103 #endif // CHROME_BROWSER_CHROMEOS_NET_WAKE_ON_WIFI_MANAGER_H_ 103 #endif // CHROME_BROWSER_CHROMEOS_NET_WAKE_ON_WIFI_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698