| Index: chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
|
| diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
|
| index 4f1d60f8d60fc9e52e34e75ddb73ec509911cd24..edea93596ec8cae5e152cf3cadf74436e1a36abd 100644
|
| --- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
|
| +++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
|
| @@ -363,8 +363,7 @@ ExtensionFunction::ResponseAction InputImeClearCompositionFunction::Run() {
|
| InputMethodEngine* engine = GetActiveEngine(
|
| Profile::FromBrowserContext(browser_context()), extension_id());
|
| if (!engine) {
|
| - return RespondNow(
|
| - OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
|
| + return RespondNow(OneArgument(base::MakeUnique<base::Value>(false)));
|
| }
|
|
|
| std::unique_ptr<ClearComposition::Params> parent_params(
|
| @@ -376,7 +375,7 @@ ExtensionFunction::ResponseAction InputImeClearCompositionFunction::Run() {
|
| bool success = engine->ClearComposition(params.context_id, &error);
|
| std::unique_ptr<base::ListValue> results =
|
| base::MakeUnique<base::ListValue>();
|
| - results->Append(base::MakeUnique<base::FundamentalValue>(success));
|
| + results->Append(base::MakeUnique<base::Value>(success));
|
| return RespondNow(success ? ArgumentList(std::move(results))
|
| : ErrorWithArguments(std::move(results), error));
|
| }
|
| @@ -404,8 +403,7 @@ InputImeSetCandidateWindowPropertiesFunction::Run() {
|
| event_router ? event_router->GetEngine(extension_id(), params.engine_id)
|
| : nullptr;
|
| if (!engine) {
|
| - return RespondNow(
|
| - OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
|
| + return RespondNow(OneArgument(base::MakeUnique<base::Value>(false)));
|
| }
|
|
|
| const SetCandidateWindowProperties::Params::Parameters::Properties&
|
| @@ -416,7 +414,7 @@ InputImeSetCandidateWindowPropertiesFunction::Run() {
|
| !engine->SetCandidateWindowVisible(*properties.visible, &error)) {
|
| std::unique_ptr<base::ListValue> results =
|
| base::MakeUnique<base::ListValue>();
|
| - results->Append(base::MakeUnique<base::FundamentalValue>(false));
|
| + results->Append(base::MakeUnique<base::Value>(false));
|
| return RespondNow(ErrorWithArguments(std::move(results), error));
|
| }
|
|
|
| @@ -462,16 +460,14 @@ InputImeSetCandidateWindowPropertiesFunction::Run() {
|
| engine->SetCandidateWindowProperty(properties_out);
|
| }
|
|
|
| - return RespondNow(
|
| - OneArgument(base::MakeUnique<base::FundamentalValue>(true)));
|
| + return RespondNow(OneArgument(base::MakeUnique<base::Value>(true)));
|
| }
|
|
|
| ExtensionFunction::ResponseAction InputImeSetCandidatesFunction::Run() {
|
| InputMethodEngine* engine = GetActiveEngine(
|
| Profile::FromBrowserContext(browser_context()), extension_id());
|
| if (!engine) {
|
| - return RespondNow(
|
| - OneArgument(base::MakeUnique<base::FundamentalValue>(true)));
|
| + return RespondNow(OneArgument(base::MakeUnique<base::Value>(true)));
|
| }
|
|
|
| std::unique_ptr<SetCandidates::Params> parent_params(
|
| @@ -499,7 +495,7 @@ ExtensionFunction::ResponseAction InputImeSetCandidatesFunction::Run() {
|
| engine->SetCandidates(params.context_id, candidates_out, &error);
|
| std::unique_ptr<base::ListValue> results =
|
| base::MakeUnique<base::ListValue>();
|
| - results->Append(base::MakeUnique<base::FundamentalValue>(success));
|
| + results->Append(base::MakeUnique<base::Value>(success));
|
| return RespondNow(success ? ArgumentList(std::move(results))
|
| : ErrorWithArguments(std::move(results), error));
|
| }
|
| @@ -508,8 +504,7 @@ ExtensionFunction::ResponseAction InputImeSetCursorPositionFunction::Run() {
|
| InputMethodEngine* engine = GetActiveEngine(
|
| Profile::FromBrowserContext(browser_context()), extension_id());
|
| if (!engine) {
|
| - return RespondNow(
|
| - OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
|
| + return RespondNow(OneArgument(base::MakeUnique<base::Value>(false)));
|
| }
|
|
|
| std::unique_ptr<SetCursorPosition::Params> parent_params(
|
| @@ -522,7 +517,7 @@ ExtensionFunction::ResponseAction InputImeSetCursorPositionFunction::Run() {
|
| engine->SetCursorPosition(params.context_id, params.candidate_id, &error);
|
| std::unique_ptr<base::ListValue> results =
|
| base::MakeUnique<base::ListValue>();
|
| - results->Append(base::MakeUnique<base::FundamentalValue>(success));
|
| + results->Append(base::MakeUnique<base::Value>(success));
|
| return RespondNow(success ? ArgumentList(std::move(results))
|
| : ErrorWithArguments(std::move(results), error));
|
| }
|
|
|