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

Side by Side Diff: chrome/browser/metrics/metrics_log.cc

Issue 23534051: Add Pepper flag to UMA plugin records. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/common/metrics/proto/system_profile.proto » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/metrics/metrics_log.h" 5 #include "chrome/browser/metrics/metrics_log.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 return PluginPrefs::GetForProfile(profiles.front()).get(); 221 return PluginPrefs::GetForProfile(profiles.front()).get();
222 } 222 }
223 223
224 // Fills |plugin| with the info contained in |plugin_info| and |plugin_prefs|. 224 // Fills |plugin| with the info contained in |plugin_info| and |plugin_prefs|.
225 void SetPluginInfo(const content::WebPluginInfo& plugin_info, 225 void SetPluginInfo(const content::WebPluginInfo& plugin_info,
226 const PluginPrefs* plugin_prefs, 226 const PluginPrefs* plugin_prefs,
227 SystemProfileProto::Plugin* plugin) { 227 SystemProfileProto::Plugin* plugin) {
228 plugin->set_name(UTF16ToUTF8(plugin_info.name)); 228 plugin->set_name(UTF16ToUTF8(plugin_info.name));
229 plugin->set_filename(plugin_info.path.BaseName().AsUTF8Unsafe()); 229 plugin->set_filename(plugin_info.path.BaseName().AsUTF8Unsafe());
230 plugin->set_version(UTF16ToUTF8(plugin_info.version)); 230 plugin->set_version(UTF16ToUTF8(plugin_info.version));
231 plugin->set_is_pepper(plugin_info.is_pepper_plugin());
231 if (plugin_prefs) 232 if (plugin_prefs)
232 plugin->set_is_disabled(!plugin_prefs->IsPluginEnabled(plugin_info)); 233 plugin->set_is_disabled(!plugin_prefs->IsPluginEnabled(plugin_info));
233 } 234 }
234 235
235 void WriteFieldTrials(const std::vector<ActiveGroupId>& field_trial_ids, 236 void WriteFieldTrials(const std::vector<ActiveGroupId>& field_trial_ids,
236 SystemProfileProto* system_profile) { 237 SystemProfileProto* system_profile) {
237 for (std::vector<ActiveGroupId>::const_iterator it = 238 for (std::vector<ActiveGroupId>::const_iterator it =
238 field_trial_ids.begin(); it != field_trial_ids.end(); ++it) { 239 field_trial_ids.begin(); it != field_trial_ids.end(); ++it) {
239 SystemProfileProto::FieldTrial* field_trial = 240 SystemProfileProto::FieldTrial* field_trial =
240 system_profile->add_field_trial(); 241 system_profile->add_field_trial();
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
955 956
956 paired_device->set_vendor_prefix(vendor_prefix); 957 paired_device->set_vendor_prefix(vendor_prefix);
957 } 958 }
958 959
959 paired_device->set_vendor_id(device->GetVendorID()); 960 paired_device->set_vendor_id(device->GetVendorID());
960 paired_device->set_product_id(device->GetProductID()); 961 paired_device->set_product_id(device->GetProductID());
961 paired_device->set_device_id(device->GetDeviceID()); 962 paired_device->set_device_id(device->GetDeviceID());
962 } 963 }
963 #endif // defined(OS_CHROMEOS) 964 #endif // defined(OS_CHROMEOS)
964 } 965 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/metrics/proto/system_profile.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698