| Index: chrome/browser/extensions/api/webview/webview_api.cc
|
| diff --git a/chrome/browser/extensions/api/webview/webview_api.cc b/chrome/browser/extensions/api/webview/webview_api.cc
|
| index a4be01abb53280aa8921fa495f9395cd0bf4b5e7..d3bfeefe9b9f5fa0303d18c7fcc16985d679352a 100644
|
| --- a/chrome/browser/extensions/api/webview/webview_api.cc
|
| +++ b/chrome/browser/extensions/api/webview/webview_api.cc
|
| @@ -46,7 +46,7 @@ int MaskForKey(const char* key) {
|
|
|
| } // namespace
|
|
|
| -bool WebviewExtensionFunction::RunImpl() {
|
| +bool WebviewExtensionFunction::RunAsync() {
|
| int instance_id = 0;
|
| EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &instance_id));
|
| WebViewGuest* guest = WebViewGuest::From(
|
| @@ -54,12 +54,12 @@ bool WebviewExtensionFunction::RunImpl() {
|
| if (!guest)
|
| return false;
|
|
|
| - return RunImplSafe(guest);
|
| + return RunAsyncSafe(guest);
|
| }
|
|
|
| // TODO(lazyboy): Add checks similar to
|
| -// WebviewExtensionFunction::RunImplSafe(WebViewGuest*).
|
| -bool WebviewContextMenusCreateFunction::RunImpl() {
|
| +// WebviewExtensionFunction::RunAsyncSafe(WebViewGuest*).
|
| +bool WebviewContextMenusCreateFunction::RunAsync() {
|
| scoped_ptr<webview::ContextMenusCreate::Params> params(
|
| webview::ContextMenusCreate::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| @@ -89,7 +89,7 @@ bool WebviewContextMenusCreateFunction::RunImpl() {
|
| return success;
|
| }
|
|
|
| -bool WebviewContextMenusUpdateFunction::RunImpl() {
|
| +bool WebviewContextMenusUpdateFunction::RunAsync() {
|
| scoped_ptr<webview::ContextMenusUpdate::Params> params(
|
| webview::ContextMenusUpdate::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| @@ -112,7 +112,7 @@ bool WebviewContextMenusUpdateFunction::RunImpl() {
|
| return success;
|
| }
|
|
|
| -bool WebviewContextMenusRemoveFunction::RunImpl() {
|
| +bool WebviewContextMenusRemoveFunction::RunAsync() {
|
| scoped_ptr<webview::ContextMenusRemove::Params> params(
|
| webview::ContextMenusRemove::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| @@ -148,7 +148,7 @@ bool WebviewContextMenusRemoveFunction::RunImpl() {
|
| return success;
|
| }
|
|
|
| -bool WebviewContextMenusRemoveAllFunction::RunImpl() {
|
| +bool WebviewContextMenusRemoveAllFunction::RunAsync() {
|
| scoped_ptr<webview::ContextMenusRemoveAll::Params> params(
|
| webview::ContextMenusRemoveAll::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| @@ -196,7 +196,7 @@ uint32 WebviewClearDataFunction::GetRemovalMask() {
|
|
|
| // TODO(lazyboy): Parameters in this extension function are similar (or a
|
| // sub-set) to BrowsingDataRemoverFunction. How can we share this code?
|
| -bool WebviewClearDataFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewClearDataFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| // Grab the initial |options| parameter, and parse out the arguments.
|
| base::DictionaryValue* options;
|
| EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &options));
|
| @@ -242,7 +242,7 @@ bool WebviewClearDataFunction::RunImplSafe(WebViewGuest* guest) {
|
| }
|
|
|
| void WebviewClearDataFunction::ClearDataDone() {
|
| - Release(); // Balanced in RunImpl().
|
| + Release(); // Balanced in RunAsync().
|
| SendResponse(true);
|
| }
|
|
|
| @@ -355,7 +355,7 @@ WebviewSetZoomFunction::WebviewSetZoomFunction() {
|
| WebviewSetZoomFunction::~WebviewSetZoomFunction() {
|
| }
|
|
|
| -bool WebviewSetZoomFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewSetZoomFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| scoped_ptr<webview::SetZoom::Params> params(
|
| webview::SetZoom::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| @@ -371,7 +371,7 @@ WebviewGetZoomFunction::WebviewGetZoomFunction() {
|
| WebviewGetZoomFunction::~WebviewGetZoomFunction() {
|
| }
|
|
|
| -bool WebviewGetZoomFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewGetZoomFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| scoped_ptr<webview::GetZoom::Params> params(
|
| webview::GetZoom::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| @@ -388,7 +388,7 @@ WebviewFindFunction::WebviewFindFunction() {
|
| WebviewFindFunction::~WebviewFindFunction() {
|
| }
|
|
|
| -bool WebviewFindFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewFindFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| scoped_ptr<webview::Find::Params> params(
|
| webview::Find::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| @@ -418,7 +418,7 @@ WebviewStopFindingFunction::WebviewStopFindingFunction() {
|
| WebviewStopFindingFunction::~WebviewStopFindingFunction() {
|
| }
|
|
|
| -bool WebviewStopFindingFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewStopFindingFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| scoped_ptr<webview::StopFinding::Params> params(
|
| webview::StopFinding::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| @@ -449,7 +449,7 @@ WebviewGoFunction::WebviewGoFunction() {
|
| WebviewGoFunction::~WebviewGoFunction() {
|
| }
|
|
|
| -bool WebviewGoFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewGoFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| scoped_ptr<webview::Go::Params> params(webview::Go::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -463,7 +463,7 @@ WebviewReloadFunction::WebviewReloadFunction() {
|
| WebviewReloadFunction::~WebviewReloadFunction() {
|
| }
|
|
|
| -bool WebviewReloadFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewReloadFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| guest->Reload();
|
| return true;
|
| }
|
| @@ -474,7 +474,7 @@ WebviewSetPermissionFunction::WebviewSetPermissionFunction() {
|
| WebviewSetPermissionFunction::~WebviewSetPermissionFunction() {
|
| }
|
|
|
| -bool WebviewSetPermissionFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewSetPermissionFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| scoped_ptr<webview::SetPermission::Params> params(
|
| webview::SetPermission::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| @@ -514,7 +514,7 @@ WebviewOverrideUserAgentFunction::WebviewOverrideUserAgentFunction() {
|
| WebviewOverrideUserAgentFunction::~WebviewOverrideUserAgentFunction() {
|
| }
|
|
|
| -bool WebviewOverrideUserAgentFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewOverrideUserAgentFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| scoped_ptr<extensions::api::webview::OverrideUserAgent::Params> params(
|
| extensions::api::webview::OverrideUserAgent::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| @@ -529,7 +529,7 @@ WebviewStopFunction::WebviewStopFunction() {
|
| WebviewStopFunction::~WebviewStopFunction() {
|
| }
|
|
|
| -bool WebviewStopFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewStopFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| guest->Stop();
|
| return true;
|
| }
|
| @@ -540,7 +540,7 @@ WebviewTerminateFunction::WebviewTerminateFunction() {
|
| WebviewTerminateFunction::~WebviewTerminateFunction() {
|
| }
|
|
|
| -bool WebviewTerminateFunction::RunImplSafe(WebViewGuest* guest) {
|
| +bool WebviewTerminateFunction::RunAsyncSafe(WebViewGuest* guest) {
|
| guest->Terminate();
|
| return true;
|
| }
|
|
|