| Index: chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
|
| diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
|
| index 165da220b19358aec89a2cc767d6d9ddbb13cdde..c483f855d61a0df4e122227e686c39541f63dd96 100644
|
| --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
|
| +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
|
| @@ -446,24 +446,18 @@ bool WebNavigationTabObserver::IsReferenceFragmentNavigation(
|
| url.ReplaceComponents(replacements);
|
| }
|
|
|
| -bool WebNavigationGetFrameFunction::RunSync() {
|
| +ExtensionFunction::ResponseAction WebNavigationGetFrameFunction::Run() {
|
| std::unique_ptr<GetFrame::Params> params(GetFrame::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| int tab_id = params->details.tab_id;
|
| int frame_id = params->details.frame_id;
|
|
|
| - SetResult(base::Value::CreateNullValue());
|
| -
|
| content::WebContents* web_contents;
|
| - if (!ExtensionTabUtil::GetTabById(tab_id,
|
| - GetProfile(),
|
| - include_incognito(),
|
| - NULL,
|
| - NULL,
|
| - &web_contents,
|
| - NULL) ||
|
| + if (!ExtensionTabUtil::GetTabById(tab_id, browser_context(),
|
| + include_incognito(), nullptr, nullptr,
|
| + &web_contents, nullptr) ||
|
| !web_contents) {
|
| - return true;
|
| + return RespondNow(OneArgument(base::Value::CreateNullValue()));
|
| }
|
|
|
| WebNavigationTabObserver* observer =
|
| @@ -477,11 +471,11 @@ bool WebNavigationGetFrameFunction::RunSync() {
|
| ExtensionApiFrameIdMap::Get()->GetRenderFrameHostById(web_contents,
|
| frame_id);
|
| if (!frame_navigation_state.IsValidFrame(render_frame_host))
|
| - return true;
|
| + return RespondNow(OneArgument(base::Value::CreateNullValue()));
|
|
|
| GURL frame_url = frame_navigation_state.GetUrl(render_frame_host);
|
| if (!frame_navigation_state.IsValidUrl(frame_url))
|
| - return true;
|
| + return RespondNow(OneArgument(base::Value::CreateNullValue()));
|
|
|
| GetFrame::Results::Details frame_details;
|
| frame_details.url = frame_url.spec();
|
| @@ -489,28 +483,21 @@ bool WebNavigationGetFrameFunction::RunSync() {
|
| frame_navigation_state.GetErrorOccurredInFrame(render_frame_host);
|
| frame_details.parent_frame_id =
|
| ExtensionApiFrameIdMap::GetFrameId(render_frame_host->GetParent());
|
| - results_ = GetFrame::Results::Create(frame_details);
|
| - return true;
|
| + return RespondNow(ArgumentList(GetFrame::Results::Create(frame_details)));
|
| }
|
|
|
| -bool WebNavigationGetAllFramesFunction::RunSync() {
|
| +ExtensionFunction::ResponseAction WebNavigationGetAllFramesFunction::Run() {
|
| std::unique_ptr<GetAllFrames::Params> params(
|
| GetAllFrames::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| int tab_id = params->details.tab_id;
|
|
|
| - SetResult(base::Value::CreateNullValue());
|
| -
|
| content::WebContents* web_contents;
|
| - if (!ExtensionTabUtil::GetTabById(tab_id,
|
| - GetProfile(),
|
| - include_incognito(),
|
| - NULL,
|
| - NULL,
|
| - &web_contents,
|
| - NULL) ||
|
| + if (!ExtensionTabUtil::GetTabById(tab_id, browser_context(),
|
| + include_incognito(), nullptr, nullptr,
|
| + &web_contents, nullptr) ||
|
| !web_contents) {
|
| - return true;
|
| + return RespondNow(OneArgument(base::Value::CreateNullValue()));
|
| }
|
|
|
| WebNavigationTabObserver* observer =
|
| @@ -535,8 +522,7 @@ bool WebNavigationGetAllFramesFunction::RunSync() {
|
| frame.error_occurred = navigation_state.GetErrorOccurredInFrame(*it);
|
| result_list.push_back(std::move(frame));
|
| }
|
| - results_ = GetAllFrames::Results::Create(result_list);
|
| - return true;
|
| + return RespondNow(ArgumentList(GetAllFrames::Results::Create(result_list)));
|
| }
|
|
|
| WebNavigationAPI::WebNavigationAPI(content::BrowserContext* context)
|
|
|