chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc - Issue 7649006: more changes

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/ui/webui/options/chromeos/core_chromeos_options_handler.cc

Issue 7649006: more changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix another typo Created 9 years, 4 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/ui/webui/options/chromeos/change_picture_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

index 295b834849a0fab0b711d9183b00e6b794d5f952..0f8ab459b280afd05bb36c5d97edd71ae276d9c6 100644

--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

@@ -26,7 +26,7 @@ Value* CoreChromeOSOptionsHandler::FetchPref(const std::string& pref_name) {

Value* pref_value = NULL;

CrosSettings::Get()->Get(pref_name, &pref_value);

- return pref_value ? pref_value : Value::CreateNullValue();

+ return pref_value ? pref_value : base::NullValue();

}

void CoreChromeOSOptionsHandler::ObservePref(const std::string& pref_name) {

@@ -88,7 +88,7 @@ void CoreChromeOSOptionsHandler::NotifySettingsChanged(

iter != pref_callback_map_.end(); ++iter) {

const std::wstring& callback_function = iter->second;

ListValue result_value;

- result_value.Append(Value::CreateStringValue(setting_name->c_str()));

+ result_value.Append(base::StringValue::New(setting_name->c_str()));

result_value.Append(value->DeepCopy());

web_ui_->CallJavascriptFunction(WideToASCII(callback_function),

result_value);