| Index: chrome/browser/metrics/chrome_metrics_service_client.h
|
| diff --git a/chrome/browser/metrics/chrome_metrics_service_client.h b/chrome/browser/metrics/chrome_metrics_service_client.h
|
| index b79878fbdcef21feb7571e0778eacf6e5c51887e..7cb7a43bc7b40f2322dbaba81f0e3faea319e7c1 100644
|
| --- a/chrome/browser/metrics/chrome_metrics_service_client.h
|
| +++ b/chrome/browser/metrics/chrome_metrics_service_client.h
|
| @@ -5,13 +5,16 @@
|
| #ifndef CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICE_CLIENT_H_
|
| #define CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICE_CLIENT_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/callback.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/threading/thread_checker.h"
|
| +#include "build/build_config.h"
|
| #include "chrome/browser/metrics/metrics_memory_details.h"
|
| #include "components/metrics/metrics_service_client.h"
|
| #include "components/metrics/profiler/tracking_synchronizer_observer.h"
|
| @@ -58,7 +61,7 @@ class ChromeMetricsServiceClient
|
| void SetMetricsClientId(const std::string& client_id) override;
|
| void OnRecordingDisabled() override;
|
| bool IsOffTheRecordSessionActive() override;
|
| - int32 GetProduct() override;
|
| + int32_t GetProduct() override;
|
| std::string GetApplicationLocale() override;
|
| bool GetBrand(std::string* brand_code) override;
|
| metrics::SystemProfileProto::Channel GetChannel() override;
|
|
|