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

Side by Side Diff: chrome/browser/chromeos/policy/device_status_collector.h

Issue 572873002: Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build break fixed Created 6 years, 3 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 CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
6 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_ 6 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 std::string os_version_; 159 std::string os_version_;
160 std::string firmware_version_; 160 std::string firmware_version_;
161 161
162 content::Geoposition position_; 162 content::Geoposition position_;
163 163
164 chromeos::system::StatisticsProvider* statistics_provider_; 164 chromeos::system::StatisticsProvider* statistics_provider_;
165 165
166 chromeos::CrosSettings* cros_settings_; 166 chromeos::CrosSettings* cros_settings_;
167 167
168 base::WeakPtrFactory<DeviceStatusCollector> weak_factory_;
169
170 // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper 168 // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
171 // way to mock geolocation exists. 169 // way to mock geolocation exists.
172 LocationUpdateRequester location_update_requester_; 170 LocationUpdateRequester location_update_requester_;
173 171
174 scoped_ptr<content::GeolocationProvider::Subscription> 172 scoped_ptr<content::GeolocationProvider::Subscription>
175 geolocation_subscription_; 173 geolocation_subscription_;
176 174
177 // Cached values of the reporting settings from the device policy. 175 // Cached values of the reporting settings from the device policy.
178 bool report_version_info_; 176 bool report_version_info_;
179 bool report_activity_times_; 177 bool report_activity_times_;
180 bool report_boot_mode_; 178 bool report_boot_mode_;
181 bool report_location_; 179 bool report_location_;
182 bool report_network_interfaces_; 180 bool report_network_interfaces_;
183 bool report_users_; 181 bool report_users_;
184 182
185 scoped_ptr<chromeos::CrosSettings::ObserverSubscription> 183 scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
186 version_info_subscription_; 184 version_info_subscription_;
187 scoped_ptr<chromeos::CrosSettings::ObserverSubscription> 185 scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
188 activity_times_subscription_; 186 activity_times_subscription_;
189 scoped_ptr<chromeos::CrosSettings::ObserverSubscription> 187 scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
190 boot_mode_subscription_; 188 boot_mode_subscription_;
191 scoped_ptr<chromeos::CrosSettings::ObserverSubscription> 189 scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
192 location_subscription_; 190 location_subscription_;
193 scoped_ptr<chromeos::CrosSettings::ObserverSubscription> 191 scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
194 network_interfaces_subscription_; 192 network_interfaces_subscription_;
195 scoped_ptr<chromeos::CrosSettings::ObserverSubscription> 193 scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
196 users_subscription_; 194 users_subscription_;
197 195
196 base::WeakPtrFactory<DeviceStatusCollector> weak_factory_;
197
198 DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector); 198 DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
199 }; 199 };
200 200
201 } // namespace policy 201 } // namespace policy
202 202
203 #endif // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_ 203 #endif // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/app_pack_updater.cc ('k') | chrome/browser/chromeos/policy/device_status_collector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698