OLD | NEW |
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 #include "chrome/browser/metrics/metrics_log.h" | 5 #include "chrome/browser/metrics/metrics_log.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 | 328 |
329 WritePluginStabilityElements(plugin_list, pref); | 329 WritePluginStabilityElements(plugin_list, pref); |
330 } | 330 } |
331 } | 331 } |
332 | 332 |
333 PrefService* MetricsLog::GetPrefService() { | 333 PrefService* MetricsLog::GetPrefService() { |
334 return g_browser_process->local_state(); | 334 return g_browser_process->local_state(); |
335 } | 335 } |
336 | 336 |
337 gfx::Size MetricsLog::GetScreenSize() const { | 337 gfx::Size MetricsLog::GetScreenSize() const { |
338 return gfx::Screen::GetPrimaryMonitor().GetSizeInPixel(); | 338 return gfx::Screen::GetPrimaryDisplay().GetSizeInPixel(); |
339 } | 339 } |
340 | 340 |
341 int MetricsLog::GetScreenCount() const { | 341 int MetricsLog::GetScreenCount() const { |
342 return gfx::Screen::GetNumMonitors(); | 342 return gfx::Screen::GetNumDisplays(); |
343 } | 343 } |
344 | 344 |
345 void MetricsLog::GetFieldTrialIds( | 345 void MetricsLog::GetFieldTrialIds( |
346 std::vector<SelectedGroupId>* field_trial_ids) const { | 346 std::vector<SelectedGroupId>* field_trial_ids) const { |
347 experiments_helper::GetFieldTrialSelectedGroupIds(field_trial_ids); | 347 experiments_helper::GetFieldTrialSelectedGroupIds(field_trial_ids); |
348 } | 348 } |
349 | 349 |
350 void MetricsLog::WriteStabilityElement( | 350 void MetricsLog::WriteStabilityElement( |
351 const std::vector<webkit::WebPluginInfo>& plugin_list, | 351 const std::vector<webkit::WebPluginInfo>& plugin_list, |
352 PrefService* pref) { | 352 PrefService* pref) { |
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
979 ProductDataToProto(google_update_metrics.google_update_data, | 979 ProductDataToProto(google_update_metrics.google_update_data, |
980 google_update->mutable_google_update_status()); | 980 google_update->mutable_google_update_status()); |
981 } | 981 } |
982 | 982 |
983 if (!google_update_metrics.product_data.version.empty()) { | 983 if (!google_update_metrics.product_data.version.empty()) { |
984 ProductDataToProto(google_update_metrics.product_data, | 984 ProductDataToProto(google_update_metrics.product_data, |
985 google_update->mutable_client_status()); | 985 google_update->mutable_client_status()); |
986 } | 986 } |
987 #endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) | 987 #endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) |
988 } | 988 } |
OLD | NEW |