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

Side by Side Diff: components/content_settings/core/browser/content_settings_default_provider.cc

Issue 1546143002: Switch to standard integer types in components/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
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 "components/content_settings/core/browser/content_settings_default_prov ider.h" 5 #include "components/content_settings/core/browser/content_settings_default_prov ider.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"
11 #include "base/basictypes.h"
12 #include "base/bind.h" 11 #include "base/bind.h"
13 #include "base/command_line.h" 12 #include "base/command_line.h"
14 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
15 #include "base/prefs/pref_registry.h" 14 #include "base/prefs/pref_registry.h"
16 #include "base/prefs/pref_service.h" 15 #include "base/prefs/pref_service.h"
17 #include "base/prefs/scoped_user_pref_update.h" 16 #include "base/prefs/scoped_user_pref_update.h"
18 #include "components/content_settings/core/browser/content_settings_rule.h" 17 #include "components/content_settings/core/browser/content_settings_rule.h"
19 #include "components/content_settings/core/browser/content_settings_utils.h" 18 #include "components/content_settings/core/browser/content_settings_utils.h"
20 #include "components/content_settings/core/browser/website_settings_info.h" 19 #include "components/content_settings/core/browser/website_settings_info.h"
21 #include "components/content_settings/core/browser/website_settings_registry.h" 20 #include "components/content_settings/core/browser/website_settings_registry.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 int int_value = prefs_->GetInteger(GetPrefName(content_type)); 353 int int_value = prefs_->GetInteger(GetPrefName(content_type));
355 return ContentSettingToValue(IntToContentSetting(int_value)).Pass(); 354 return ContentSettingToValue(IntToContentSetting(int_value)).Pass();
356 } 355 }
357 356
358 void DefaultProvider::DiscardObsoletePreferences() { 357 void DefaultProvider::DiscardObsoletePreferences() {
359 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting); 358 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting);
360 prefs_->ClearPref(kObsoleteMediaStreamSetting); 359 prefs_->ClearPref(kObsoleteMediaStreamSetting);
361 } 360 }
362 361
363 } // namespace content_settings 362 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698