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

Side by Side Diff: chrome/browser/content_settings/content_settings_default_provider.cc

Issue 371933002: Add UMA for the new generic permisison class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
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/content_settings/content_settings_default_provider.h" 5 #include "chrome/browser/content_settings/content_settings_default_provider.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 UMA_HISTOGRAM_ENUMERATION( 162 UMA_HISTOGRAM_ENUMERATION(
163 "ContentSettings.DefaultMediaStreamSetting", 163 "ContentSettings.DefaultMediaStreamSetting",
164 ValueToContentSetting( 164 ValueToContentSetting(
165 default_settings_[CONTENT_SETTINGS_TYPE_MEDIASTREAM].get()), 165 default_settings_[CONTENT_SETTINGS_TYPE_MEDIASTREAM].get()),
166 CONTENT_SETTING_NUM_SETTINGS); 166 CONTENT_SETTING_NUM_SETTINGS);
167 UMA_HISTOGRAM_ENUMERATION( 167 UMA_HISTOGRAM_ENUMERATION(
168 "ContentSettings.DefaultMIDISysExSetting", 168 "ContentSettings.DefaultMIDISysExSetting",
169 ValueToContentSetting( 169 ValueToContentSetting(
170 default_settings_[CONTENT_SETTINGS_TYPE_MIDI_SYSEX].get()), 170 default_settings_[CONTENT_SETTINGS_TYPE_MIDI_SYSEX].get()),
171 CONTENT_SETTING_NUM_SETTINGS); 171 CONTENT_SETTING_NUM_SETTINGS);
172 172 UMA_HISTOGRAM_ENUMERATION(
173 // TODO(miguelg): Add UMA for Push messaging here 173 "ContentSettings.DefaultPushMessagingSetting",
174 ValueToContentSetting(
175 default_settings_[CONTENT_SETTINGS_TYPE_PUSH_MESSAGING].get()),
176 CONTENT_SETTING_NUM_SETTINGS);
174 177
175 pref_change_registrar_.Init(prefs_); 178 pref_change_registrar_.Init(prefs_);
176 PrefChangeRegistrar::NamedChangeCallback callback = base::Bind( 179 PrefChangeRegistrar::NamedChangeCallback callback = base::Bind(
177 &DefaultProvider::OnPreferenceChanged, base::Unretained(this)); 180 &DefaultProvider::OnPreferenceChanged, base::Unretained(this));
178 pref_change_registrar_.Add(prefs::kDefaultContentSettings, callback); 181 pref_change_registrar_.Add(prefs::kDefaultContentSettings, callback);
179 } 182 }
180 183
181 DefaultProvider::~DefaultProvider() { 184 DefaultProvider::~DefaultProvider() {
182 } 185 }
183 186
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 // Migrate obsolete cookie prompt mode. 339 // Migrate obsolete cookie prompt mode.
337 if (ValueToContentSetting( 340 if (ValueToContentSetting(
338 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == 341 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==
339 CONTENT_SETTING_ASK) { 342 CONTENT_SETTING_ASK) {
340 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( 343 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(
341 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); 344 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
342 } 345 }
343 } 346 }
344 347
345 } // namespace content_settings 348 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698