diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-02 19:26:53 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-02 19:26:53 +0000 |
| commit | 0f8bf4febe7b33acf6642515533c52a1be872b76 (patch) | |
| tree | 9061b6516588207f677f14cf6dfd3037896e7bfc /chrome/browser/extensions/api/web_view | |
| parent | 2342be221992aa1dc3773cd9f384a8738b1a9062 (diff) | |
| download | chromium_src-0f8bf4febe7b33acf6642515533c52a1be872b76.zip chromium_src-0f8bf4febe7b33acf6642515533c52a1be872b76.tar.gz chromium_src-0f8bf4febe7b33acf6642515533c52a1be872b76.tar.bz2 | |
Remove page id from extension's script execution callbacks.
BUG=371151
TEST=everything still works
Review URL: https://codereview.chromium.org/368723002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/web_view')
| -rw-r--r-- | chrome/browser/extensions/api/web_view/web_view_internal_api.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/web_view/web_view_internal_api.h | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/extensions/api/web_view/web_view_internal_api.cc b/chrome/browser/extensions/api/web_view/web_view_internal_api.cc index a3361f4..ac0e542 100644 --- a/chrome/browser/extensions/api/web_view/web_view_internal_api.cc +++ b/chrome/browser/extensions/api/web_view/web_view_internal_api.cc @@ -322,13 +322,12 @@ WebViewInternalExecuteScriptFunction::WebViewInternalExecuteScriptFunction() { void WebViewInternalExecuteScriptFunction::OnExecuteCodeFinished( const std::string& error, - int32 on_page_id, const GURL& on_url, const base::ListValue& result) { if (error.empty()) SetResult(result.DeepCopy()); WebViewInternalExecuteCodeFunction::OnExecuteCodeFinished( - error, on_page_id, on_url, result); + error, on_url, result); } WebViewInternalInsertCSSFunction::WebViewInternalInsertCSSFunction() { diff --git a/chrome/browser/extensions/api/web_view/web_view_internal_api.h b/chrome/browser/extensions/api/web_view/web_view_internal_api.h index 3ccf27d..4cf3e84 100644 --- a/chrome/browser/extensions/api/web_view/web_view_internal_api.h +++ b/chrome/browser/extensions/api/web_view/web_view_internal_api.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_EXTENSIONS_API_WEBVIEW_WEB_VIEW_INTERNRAL_API_H_ -#define CHROME_BROWSER_EXTENSIONS_API_WEBVIEW_WEB_VIEW_INTERNRAL_API_H_ +#ifndef CHROME_BROWSER_EXTENSIONS_API_WEB_VIEW_WEB_VIEW_INTERNAL_API_H_ +#define CHROME_BROWSER_EXTENSIONS_API_WEB_VIEW_WEB_VIEW_INTERNAL_API_H_ #include "chrome/browser/extensions/api/capture_web_contents_function.h" #include "chrome/browser/extensions/api/execute_code_function.h" @@ -186,7 +186,6 @@ class WebViewInternalExecuteScriptFunction virtual ~WebViewInternalExecuteScriptFunction() {} virtual void OnExecuteCodeFinished(const std::string& error, - int32 on_page_id, const GURL& on_url, const base::ListValue& result) OVERRIDE; @@ -440,4 +439,4 @@ class WebViewInternalTerminateFunction } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_API_WEBVIEW_WEB_VIEW_INTERNRAL_API_H_ +#endif // CHROME_BROWSER_EXTENSIONS_API_WEB_VIEW_WEB_VIEW_INTERNAL_API_H_ |