Skip to content

GitLab

T
tangled
Commit 94a2445f authored by rdevlin.cronin's avatar rdevlin.cronin Committed by Commit bot
Browse files
Options

[Extensions] Convert some SyncExtensionFunctions 

SyncExtensionFunctions, AsyncExtensionFunctions,
ChromeSyncExtensionFunctions, and ChromeAsyncExtensionFunctions are
deprecated.

Remove SyncExtensionFunctions from:
- easy_unlock_private
- input_api

Note: input_api had some tests which were incorrectly passing,
even though an error was being thrown. See crbug.com/641425

BUG=634140

Review-Url: https://codereview.chromium.org/2285573002
Cr-Commit-Position: refs/heads/master@{#415170}
parent 5ab9e3dc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 210 deletions
chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
View file @ 94a2445f
......@@ -357,12 +357,12 @@ InputMethodEngineBase* InputImeEventRouter::GetActiveEngine(
: nullptr;
}
bool InputImeClearCompositionFunction::RunSync() {
ExtensionFunction::ResponseAction InputImeClearCompositionFunction::Run() {
InputMethodEngine* engine = GetActiveEngine(
Profile::FromBrowserContext(browser_context()), extension_id());
if (!engine) {
SetResult(base::MakeUnique<base::FundamentalValue>(false));
return true;
return RespondNow(
OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
}
std::unique_ptr<ClearComposition::Params> parent_params(
......@@ -370,9 +370,8 @@ bool InputImeClearCompositionFunction::RunSync() {
const ClearComposition::Params::Parameters& params =
parent_params->parameters;
SetResult(base::MakeUnique<base::FundamentalValue>(
engine->ClearComposition(params.context_id, &error_)));
return true;
return RespondNow(OneArgument(base::MakeUnique<base::FundamentalValue>(
engine->ClearComposition(params.context_id, &error_))));
}
bool InputImeHideInputViewFunction::RunAsync() {
......@@ -385,7 +384,8 @@ bool InputImeHideInputViewFunction::RunAsync() {
return true;
}
bool InputImeSetCandidateWindowPropertiesFunction::RunSync() {
ExtensionFunction::ResponseAction
InputImeSetCandidateWindowPropertiesFunction::Run() {
std::unique_ptr<SetCandidateWindowProperties::Params> parent_params(
SetCandidateWindowProperties::Params::Create(*args_));
const SetCandidateWindowProperties::Params::Parameters&
......@@ -397,8 +397,8 @@ bool InputImeSetCandidateWindowPropertiesFunction::RunSync() {
event_router ? event_router->GetEngine(extension_id(), params.engine_id)
: nullptr;
if (!engine) {
SetResult(base::MakeUnique<base::FundamentalValue>(false));
return true;
return RespondNow(
OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
}
const SetCandidateWindowProperties::Params::Parameters::Properties&
......@@ -406,8 +406,8 @@ bool InputImeSetCandidateWindowPropertiesFunction::RunSync() {
if (properties.visible &&
!engine->SetCandidateWindowVisible(*properties.visible, &error_)) {
SetResult(base::MakeUnique<base::FundamentalValue>(false));
return true;
return RespondNow(
OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
}
InputMethodEngine::CandidateWindowProperty properties_out =
......@@ -452,17 +452,16 @@ bool InputImeSetCandidateWindowPropertiesFunction::RunSync() {
engine->SetCandidateWindowProperty(properties_out);
}
SetResult(base::MakeUnique<base::FundamentalValue>(true));
return true;
return RespondNow(
OneArgument(base::MakeUnique<base::FundamentalValue>(true)));
}
bool InputImeSetCandidatesFunction::RunSync() {
ExtensionFunction::ResponseAction InputImeSetCandidatesFunction::Run() {
InputMethodEngine* engine = GetActiveEngine(
Profile::FromBrowserContext(browser_context()), extension_id());
if (!engine) {
SetResult(base::MakeUnique<base::FundamentalValue>(true));
return true;
return RespondNow(
OneArgument(base::MakeUnique<base::FundamentalValue>(true)));
}
std::unique_ptr<SetCandidates::Params> parent_params(
......@@ -485,17 +484,16 @@ bool InputImeSetCandidatesFunction::RunSync() {
}
}
SetResult(base::MakeUnique<base::FundamentalValue>(
engine->SetCandidates(params.context_id, candidates_out, &error_)));
return true;
return RespondNow(OneArgument(base::MakeUnique<base::FundamentalValue>(
engine->SetCandidates(params.context_id, candidates_out, &error_))));
}
bool InputImeSetCursorPositionFunction::RunSync() {
ExtensionFunction::ResponseAction InputImeSetCursorPositionFunction::Run() {
InputMethodEngine* engine = GetActiveEngine(
Profile::FromBrowserContext(browser_context()), extension_id());
if (!engine) {
SetResult(base::MakeUnique<base::FundamentalValue>(false));
return true;
return RespondNow(
OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
}
std::unique_ptr<SetCursorPosition::Params> parent_params(
......@@ -503,12 +501,12 @@ bool InputImeSetCursorPositionFunction::RunSync() {
const SetCursorPosition::Params::Parameters& params =
parent_params->parameters;
SetResult(base::MakeUnique<base::FundamentalValue>(engine->SetCursorPosition(
params.context_id, params.candidate_id, &error_)));
return true;
return RespondNow(OneArgument(
base::MakeUnique<base::FundamentalValue>(engine->SetCursorPosition(
params.context_id, params.candidate_id, &error_))));
}
bool InputImeSetMenuItemsFunction::RunSync() {
ExtensionFunction::ResponseAction InputImeSetMenuItemsFunction::Run() {
std::unique_ptr<SetMenuItems::Params> parent_params(
SetMenuItems::Params::Create(*args_));
const SetMenuItems::Params::Parameters& params =
......@@ -519,10 +517,8 @@ bool InputImeSetMenuItemsFunction::RunSync() {
InputMethodEngine* engine =
event_router ? event_router->GetEngine(extension_id(), params.engine_id)
: nullptr;
if (!engine) {
error_ = kErrorEngineNotAvailable;
return false;
}
if (!engine)
return RespondNow(Error(kErrorEngineNotAvailable));
std::vector<chromeos::input_method::InputMethodManager::MenuItem> items_out;
for (const input_ime::MenuItem& item_in : params.items) {
......@@ -531,11 +527,11 @@ bool InputImeSetMenuItemsFunction::RunSync() {
}
if (!engine->SetMenuItems(items_out))
error_ = kErrorSetMenuItemsFail;
return true;
return RespondNow(Error(kErrorSetMenuItemsFail));
return RespondNow(NoArguments());
}
bool InputImeUpdateMenuItemsFunction::RunSync() {
ExtensionFunction::ResponseAction InputImeUpdateMenuItemsFunction::Run() {
std::unique_ptr<UpdateMenuItems::Params> parent_params(
UpdateMenuItems::Params::Create(*args_));
const UpdateMenuItems::Params::Parameters& params =
......@@ -546,10 +542,8 @@ bool InputImeUpdateMenuItemsFunction::RunSync() {
InputMethodEngine* engine =
event_router ? event_router->GetEngine(extension_id(), params.engine_id)
: nullptr;
if (!engine) {
error_ = kErrorEngineNotAvailable;
return false;
}
if (!engine)
return RespondNow(Error(kErrorEngineNotAvailable));
std::vector<chromeos::input_method::InputMethodManager::MenuItem> items_out;
for (const input_ime::MenuItem& item_in : params.items) {
......@@ -558,11 +552,11 @@ bool InputImeUpdateMenuItemsFunction::RunSync() {
}
if (!engine->UpdateMenuItems(items_out))
error_ = kErrorUpdateMenuItemsFail;
return true;
return RespondNow(Error(kErrorUpdateMenuItemsFail));
return RespondNow(NoArguments());
}
bool InputImeDeleteSurroundingTextFunction::RunSync() {
ExtensionFunction::ResponseAction InputImeDeleteSurroundingTextFunction::Run() {
std::unique_ptr<DeleteSurroundingText::Params> parent_params(
DeleteSurroundingText::Params::Create(*args_));
const DeleteSurroundingText::Params::Parameters& params =
......@@ -573,14 +567,12 @@ bool InputImeDeleteSurroundingTextFunction::RunSync() {
InputMethodEngine* engine =
event_router ? event_router->GetEngine(extension_id(), params.engine_id)
: nullptr;
if (!engine) {
error_ = kErrorEngineNotAvailable;
return false;
}
if (!engine)
return RespondNow(Error(kErrorEngineNotAvailable));
engine->DeleteSurroundingText(params.context_id, params.offset, params.length,
&error_);
return true;
return RespondNow(NoArguments());
}
ExtensionFunction::ResponseAction
......
chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h
View file @ 94a2445f
......@@ -21,7 +21,7 @@ class InputMethodEngine;
namespace extensions {
class InputImeClearCompositionFunction : public SyncExtensionFunction {
class InputImeClearCompositionFunction : public UIThreadExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION("input.ime.clearComposition",
INPUT_IME_CLEARCOMPOSITION)
......@@ -30,11 +30,11 @@ class InputImeClearCompositionFunction : public SyncExtensionFunction {
~InputImeClearCompositionFunction() override {}
// ExtensionFunction:
bool RunSync() override;
ResponseAction Run() override;
};
class InputImeSetCandidateWindowPropertiesFunction
: public SyncExtensionFunction {
: public UIThreadExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION("input.ime.setCandidateWindowProperties",
INPUT_IME_SETCANDIDATEWINDOWPROPERTIES)
......@@ -43,10 +43,10 @@ class InputImeSetCandidateWindowPropertiesFunction
~InputImeSetCandidateWindowPropertiesFunction() override {}
// ExtensionFunction:
bool RunSync() override;
ResponseAction Run() override;
};
class InputImeSetCandidatesFunction : public SyncExtensionFunction {
class InputImeSetCandidatesFunction : public UIThreadExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION("input.ime.setCandidates", INPUT_IME_SETCANDIDATES)
......@@ -54,10 +54,10 @@ class InputImeSetCandidatesFunction : public SyncExtensionFunction {
~InputImeSetCandidatesFunction() override {}
// ExtensionFunction:
bool RunSync() override;
ResponseAction Run() override;
};
class InputImeSetCursorPositionFunction : public SyncExtensionFunction {
class InputImeSetCursorPositionFunction : public UIThreadExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION("input.ime.setCursorPosition",
INPUT_IME_SETCURSORPOSITION)
......@@ -66,10 +66,10 @@ class InputImeSetCursorPositionFunction : public SyncExtensionFunction {
~InputImeSetCursorPositionFunction() override {}
// ExtensionFunction:
bool RunSync() override;
ResponseAction Run() override;
};
class InputImeSetMenuItemsFunction : public SyncExtensionFunction {
class InputImeSetMenuItemsFunction : public UIThreadExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION("input.ime.setMenuItems", INPUT_IME_SETMENUITEMS)
......@@ -77,10 +77,10 @@ class InputImeSetMenuItemsFunction : public SyncExtensionFunction {
~InputImeSetMenuItemsFunction() override {}
// ExtensionFunction:
bool RunSync() override;
ResponseAction Run() override;
};
class InputImeUpdateMenuItemsFunction : public SyncExtensionFunction {
class InputImeUpdateMenuItemsFunction : public UIThreadExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION("input.ime.updateMenuItems",
INPUT_IME_UPDATEMENUITEMS)
......@@ -89,10 +89,10 @@ class InputImeUpdateMenuItemsFunction : public SyncExtensionFunction {
~InputImeUpdateMenuItemsFunction() override {}
// ExtensionFunction:
bool RunSync() override;
ResponseAction Run() override;
};
class InputImeDeleteSurroundingTextFunction : public SyncExtensionFunction {
class InputImeDeleteSurroundingTextFunction : public UIThreadExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION("input.ime.deleteSurroundingText",
INPUT_IME_DELETESURROUNDINGTEXT)
......@@ -100,7 +100,7 @@ class InputImeDeleteSurroundingTextFunction : public SyncExtensionFunction {
~InputImeDeleteSurroundingTextFunction() override {}
// ExtensionFunction:
bool RunSync() override;
ResponseAction Run() override;
};
class InputImeHideInputViewFunction : public AsyncExtensionFunction {
......
chrome/test/data/extensions/api_test/input_ime/background.js
View file @ 94a2445f
......@@ -79,38 +79,39 @@ function setCursorPositionTest() {
}
function setMenuItemsTest() {
chrome.input.ime.setMenuItems({
"engineID": "test",
"items": [{
"id": "Menu 1",
"label": "Menu 1",
"style": "check",
"visible": true,
"enabled": true
}, {
"id": "Menu 2",
"label": "Menu 2",
"style": "radio",
"visible": true,
"enabled": true
}]
}, chrome.test.callbackPass());
}
function updateMenuItemsTest() {
chrome.input.ime.updateMenuItems({
"engineID": "test",
"items": [{
"id": "Menu 1",
"enabled": false
}, {
"id": "Menu 2",
"visible": false,
}]
}, chrome.test.callbackPass());
}
// Disabled: crbug.com/641425.
// function setMenuItemsTest() {
// chrome.input.ime.setMenuItems({
// "engineID": "test",
// "items": [{
// "id": "Menu 1",
// "label": "Menu 1",
// "style": "check",
// "visible": true,
// "enabled": true
// }, {
// "id": "Menu 2",
// "label": "Menu 2",
// "style": "radio",
// "visible": true,
// "enabled": true
// }]
// }, chrome.test.callbackPass());
// }
// Disabled: crbug.com/641425.
// function updateMenuItemsTest() {
// chrome.input.ime.updateMenuItems({
// "engineID": "test",
// "items": [{
// "id": "Menu 1",
// "enabled": false
// }, {
// "id": "Menu 2",
// "visible": false,
// }]
// }, chrome.test.callbackPass());
// }
function deleteSurroundingText() {
chrome.input.ime.deleteSurroundingText({
......@@ -124,5 +125,5 @@ function deleteSurroundingText() {
chrome.test.runTests([setCompositionTest, clearCompositionTest,
commitTextTest, setCandidateWindowPropertiesTest,
setCandidatesTest, setCursorPositionTest,
setMenuItemsTest, updateMenuItemsTest,
/*setMenuItemsTest, updateMenuItemsTest, */
deleteSurroundingText]);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment