chrome/browser/content_settings/content_settings_default_provider.cc - Issue 385263004: Get rid of some uses of CreateIntegerValue

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/content_settings_default_provider.cc

Issue 385263004: Get rid of some uses of CreateIntegerValue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc ('k') | chrome/browser/content_settings/content_settings_default_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_default_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc

index c64a076be9bce303326dfa83647980203d92141d..46c8540a1fe48641d4f8fde34e23a278802ed9f6 100644

--- a/chrome/browser/content_settings/content_settings_default_provider.cc

+++ b/chrome/browser/content_settings/content_settings_default_provider.cc

@@ -223,7 +223,7 @@ bool DefaultProvider::SetWebsiteSetting(

// If |value| is NULL we need to reset the default setting the the

// hardcoded default.

default_settings_[content_type].reset(

- base::Value::CreateIntegerValue(kDefaultSettings[content_type]));

+ new base::FundamentalValue(kDefaultSettings[content_type]));

// Remove the corresponding pref entry since the hardcoded default value

// is used.

@@ -315,7 +315,7 @@ void DefaultProvider::ForceDefaultsToBeExplicit() {

if (!default_settings_[type].get() &&

kDefaultSettings[i] != CONTENT_SETTING_DEFAULT) {

default_settings_[type].reset(

- base::Value::CreateIntegerValue(kDefaultSettings[i]));

+ new base::FundamentalValue(kDefaultSettings[i]));

}

@@ -331,7 +331,7 @@ void DefaultProvider::GetSettingsFromDictionary(

bool is_integer = i.value().GetAsInteger(&int_value);

DCHECK(is_integer);

default_settings_[ContentSettingsType(type)].reset(

- base::Value::CreateIntegerValue(int_value));

+ new base::FundamentalValue(int_value));

break;

}

@@ -341,7 +341,7 @@ void DefaultProvider::GetSettingsFromDictionary(

default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==

CONTENT_SETTING_ASK) {

default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(

- base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));

+ new base::FundamentalValue(CONTENT_SETTING_BLOCK));

}