chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc - Issue 2664753002: Remove base::StringValue

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/settings/chromeos/easy_unlock_settings_handler.cc

Issue 2664753002: Remove base::StringValue (Closed)

Patch Set: Rebase Created 3 years, 9 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/settings/chromeos/device_stylus_handler.cc ('k') | chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc

diff --git a/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc b/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc

index b1f00022bcadf68474dc3435576b4511aeb766a5..c16ef08e51090a0f8e11d5e66b95941d5ccfc0b4 100644

--- a/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc

+++ b/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc

@@ -87,14 +87,13 @@ void EasyUnlockSettingsHandler::OnJavascriptDisallowed() {

void EasyUnlockSettingsHandler::OnTurnOffOperationStatusChanged() {

CallJavascriptFunction("cr.webUIListenerCallback",

- base::StringValue("easy-unlock-turn-off-flow-status"),

- base::StringValue(GetTurnOffFlowStatus()));

+ base::Value("easy-unlock-turn-off-flow-status"),

+ base::Value(GetTurnOffFlowStatus()));

}

void EasyUnlockSettingsHandler::SendEnabledStatus() {

CallJavascriptFunction(

- "cr.webUIListenerCallback",

- base::StringValue("easy-unlock-enabled-status"),

+ "cr.webUIListenerCallback", base::Value("easy-unlock-enabled-status"),

base::Value(EasyUnlockService::Get(profile_)->IsEnabled()));

}

@@ -145,8 +144,7 @@ void EasyUnlockSettingsHandler::HandleGetTurnOffFlowStatus(

CHECK_EQ(1U, args->GetSize());

const base::Value* callback_id;

CHECK(args->Get(0, &callback_id));

- ResolveJavascriptCallback(*callback_id,

- base::StringValue(GetTurnOffFlowStatus()));

+ ResolveJavascriptCallback(*callback_id, base::Value(GetTurnOffFlowStatus()));

}

void EasyUnlockSettingsHandler::HandleStartTurnOffFlow(