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

Side by Side Diff: components/data_use_measurement/content/data_use_measurement.h

Issue 1921973002: Convert //components/[a-e]* 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_ 5 #ifndef COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_
6 #define COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_ 6 #define COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <string> 11 #include <string>
11 12
12 #include "base/callback.h" 13 #include "base/callback.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "components/data_use_measurement/core/data_use_user_data.h" 16 #include "components/data_use_measurement/core/data_use_user_data.h"
17 #include "components/metrics/data_use_tracker.h" 17 #include "components/metrics/data_use_tracker.h"
18 18
19 #if defined(OS_ANDROID) 19 #if defined(OS_ANDROID)
20 #include "base/android/application_status_listener.h" 20 #include "base/android/application_status_listener.h"
21 #endif 21 #endif
22 22
23 namespace net { 23 namespace net {
24 class URLRequest; 24 class URLRequest;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // class to support registering arbitrary observers. crbug.com/601185 93 // class to support registering arbitrary observers. crbug.com/601185
94 metrics::UpdateUsagePrefCallbackType metrics_data_use_forwarder_; 94 metrics::UpdateUsagePrefCallbackType metrics_data_use_forwarder_;
95 95
96 #if defined(OS_ANDROID) 96 #if defined(OS_ANDROID)
97 // Application listener store the last known state of the application in this 97 // Application listener store the last known state of the application in this
98 // field. 98 // field.
99 base::android::ApplicationState app_state_; 99 base::android::ApplicationState app_state_;
100 100
101 // ApplicationStatusListener used to monitor whether the application is in the 101 // ApplicationStatusListener used to monitor whether the application is in the
102 // foreground or in the background. It is owned by DataUseMeasurement. 102 // foreground or in the background. It is owned by DataUseMeasurement.
103 scoped_ptr<base::android::ApplicationStatusListener> app_listener_; 103 std::unique_ptr<base::android::ApplicationStatusListener> app_listener_;
104 #endif 104 #endif
105 105
106 DISALLOW_COPY_AND_ASSIGN(DataUseMeasurement); 106 DISALLOW_COPY_AND_ASSIGN(DataUseMeasurement);
107 }; 107 };
108 108
109 } // namespace data_use_measurement 109 } // namespace data_use_measurement
110 110
111 #endif // COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_ 111 #endif // COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698