| Index: chrome/browser/metrics/metrics_log.h
|
| ===================================================================
|
| --- chrome/browser/metrics/metrics_log.h (revision 212806)
|
| +++ chrome/browser/metrics/metrics_log.h (working copy)
|
| @@ -30,6 +30,10 @@
|
| class DictionaryValue;
|
| }
|
|
|
| +namespace content {
|
| +struct WebPluginInfo;
|
| +}
|
| +
|
| namespace device {
|
| class BluetoothAdapter;
|
| }
|
| @@ -42,10 +46,6 @@
|
| struct ActiveGroupId;
|
| }
|
|
|
| -namespace webkit {
|
| -struct WebPluginInfo;
|
| -}
|
| -
|
| // This is a small helper struct to pass Google Update metrics in a single
|
| // reference argument to MetricsLog::RecordEnvironment().
|
| struct GoogleUpdateMetrics {
|
| @@ -94,7 +94,7 @@
|
| // that are to be recorded. Each value in profile_metrics should be a
|
| // dictionary giving the metrics for the profile.
|
| void RecordEnvironment(
|
| - const std::vector<webkit::WebPluginInfo>& plugin_list,
|
| + const std::vector<content::WebPluginInfo>& plugin_list,
|
| const GoogleUpdateMetrics& google_update_metrics);
|
|
|
| // Records the current operating environment. Takes the list of installed
|
| @@ -104,7 +104,7 @@
|
| // environment with *each* protobuf upload, but only with the initial XML
|
| // upload.
|
| void RecordEnvironmentProto(
|
| - const std::vector<webkit::WebPluginInfo>& plugin_list,
|
| + const std::vector<content::WebPluginInfo>& plugin_list,
|
| const GoogleUpdateMetrics& google_update_metrics);
|
|
|
| // Records the input text, available choices, and selected entry when the
|
| @@ -124,7 +124,7 @@
|
| // installed plugins as a parameter because that can't be obtained
|
| // synchronously from the UI thread.
|
| void RecordIncrementalStabilityElements(
|
| - const std::vector<webkit::WebPluginInfo>& plugin_list);
|
| + const std::vector<content::WebPluginInfo>& plugin_list);
|
|
|
| protected:
|
| // Exposed for the sake of mocking in test code.
|
| @@ -152,12 +152,12 @@
|
| // Writes application stability metrics (as part of the profile log).
|
| // NOTE: Has the side-effect of clearing those counts.
|
| void WriteStabilityElement(
|
| - const std::vector<webkit::WebPluginInfo>& plugin_list,
|
| + const std::vector<content::WebPluginInfo>& plugin_list,
|
| PrefService* pref);
|
|
|
| // Within stability group, write plugin crash stats.
|
| void WritePluginStabilityElements(
|
| - const std::vector<webkit::WebPluginInfo>& plugin_list,
|
| + const std::vector<content::WebPluginInfo>& plugin_list,
|
| PrefService* pref);
|
|
|
| // Within the stability group, write required attributes.
|
| @@ -170,7 +170,7 @@
|
| void WriteRealtimeStabilityAttributes(PrefService* pref);
|
|
|
| // Writes the list of installed plugins.
|
| - void WritePluginList(const std::vector<webkit::WebPluginInfo>& plugin_list);
|
| + void WritePluginList(const std::vector<content::WebPluginInfo>& plugin_list);
|
|
|
| // Writes info about the Google Update install that is managing this client.
|
| // This is a no-op if called on a non-Windows platform.
|
|
|