summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/activity_log/activity_log.cc1
-rw-r--r--chrome/browser/extensions/activity_log/activity_log.h1
-rw-r--r--chrome/browser/extensions/activity_log/activity_log_unittest.cc2
-rw-r--r--chrome/browser/extensions/api/execute_code_function.cc1
-rw-r--r--chrome/browser/extensions/api/execute_code_function.h1
-rw-r--r--chrome/browser/extensions/api/tabs/tabs_api.cc5
-rw-r--r--chrome/browser/extensions/api/tabs/tabs_api.h2
-rw-r--r--chrome/browser/extensions/api/web_view/web_view_internal_api.cc3
-rw-r--r--chrome/browser/extensions/api/web_view/web_view_internal_api.h7
-rw-r--r--chrome/browser/extensions/script_executor.cc6
-rw-r--r--chrome/browser/extensions/script_executor.h7
-rw-r--r--chrome/browser/extensions/tab_helper.cc2
-rw-r--r--chrome/browser/extensions/tab_helper.h2
13 files changed, 12 insertions, 28 deletions
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
index 1ae3058..17436ce 100644
--- a/chrome/browser/extensions/activity_log/activity_log.cc
+++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -570,7 +570,6 @@ void ActivityLog::LogAction(scoped_refptr<Action> action) {
void ActivityLog::OnScriptsExecuted(
const content::WebContents* web_contents,
const ExecutingScriptsMap& extension_ids,
- int32 on_page_id,
const GURL& on_url) {
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
diff --git a/chrome/browser/extensions/activity_log/activity_log.h b/chrome/browser/extensions/activity_log/activity_log.h
index 194b409..28680f8 100644
--- a/chrome/browser/extensions/activity_log/activity_log.h
+++ b/chrome/browser/extensions/activity_log/activity_log.h
@@ -155,7 +155,6 @@ class ActivityLog : public BrowserContextKeyedAPI,
virtual void OnScriptsExecuted(
const content::WebContents* web_contents,
const ExecutingScriptsMap& extension_ids,
- int32 page_id,
const GURL& on_url) OVERRIDE;
#endif
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
index 5c2468a..ed7fd0b 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -264,7 +264,7 @@ TEST_F(ActivityLogTest, LogPrerender) {
executing_scripts[extension->id()].insert("script");
static_cast<TabHelper::ScriptExecutionObserver*>(activity_log)->
- OnScriptsExecuted(contents, executing_scripts, 0, url);
+ OnScriptsExecuted(contents, executing_scripts, url);
activity_log->GetFilteredActions(
extension->id(),
diff --git a/chrome/browser/extensions/api/execute_code_function.cc b/chrome/browser/extensions/api/execute_code_function.cc
index 848b862..81fc9b2 100644
--- a/chrome/browser/extensions/api/execute_code_function.cc
+++ b/chrome/browser/extensions/api/execute_code_function.cc
@@ -214,7 +214,6 @@ bool ExecuteCodeFunction::RunAsync() {
void ExecuteCodeFunction::OnExecuteCodeFinished(
const std::string& error,
- int32 on_page_id,
const GURL& on_url,
const base::ListValue& result) {
if (!error.empty())
diff --git a/chrome/browser/extensions/api/execute_code_function.h b/chrome/browser/extensions/api/execute_code_function.h
index da7e73d..d8d2fc5 100644
--- a/chrome/browser/extensions/api/execute_code_function.h
+++ b/chrome/browser/extensions/api/execute_code_function.h
@@ -33,7 +33,6 @@ class ExecuteCodeFunction : public ChromeAsyncExtensionFunction {
virtual bool IsWebView() const = 0;
virtual const GURL& GetWebViewSrc() const = 0;
virtual void OnExecuteCodeFinished(const std::string& error,
- int32 on_page_id,
const GURL& on_url,
const base::ListValue& result);
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 8d895f3..a6695969 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -1225,7 +1225,6 @@ void TabsUpdateFunction::PopulateResult() {
void TabsUpdateFunction::OnExecuteCodeFinished(
const std::string& error,
- int32 on_page_id,
const GURL& url,
const base::ListValue& script_result) {
if (error.empty())
@@ -1700,13 +1699,11 @@ bool TabsExecuteScriptFunction::ShouldInsertCSS() const {
void TabsExecuteScriptFunction::OnExecuteCodeFinished(
const std::string& error,
- int32 on_page_id,
const GURL& on_url,
const base::ListValue& result) {
if (error.empty())
SetResult(result.DeepCopy());
- ExecuteCodeInTabFunction::OnExecuteCodeFinished(error, on_page_id, on_url,
- result);
+ ExecuteCodeInTabFunction::OnExecuteCodeFinished(error, on_url, result);
}
bool ExecuteCodeInTabFunction::Init() {
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.h b/chrome/browser/extensions/api/tabs/tabs_api.h
index 720b93c..fd45e37 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.h
+++ b/chrome/browser/extensions/api/tabs/tabs_api.h
@@ -150,7 +150,6 @@ class TabsUpdateFunction : public ChromeAsyncExtensionFunction {
private:
virtual bool RunAsync() OVERRIDE;
void OnExecuteCodeFinished(const std::string& error,
- int32 on_page_id,
const GURL& on_url,
const base::ListValue& script_result);
@@ -240,7 +239,6 @@ class TabsExecuteScriptFunction : public ExecuteCodeInTabFunction {
virtual void OnExecuteCodeFinished(
const std::string& error,
- int32 on_page_id,
const GURL& on_url,
const base::ListValue& script_result) OVERRIDE;
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_
diff --git a/chrome/browser/extensions/script_executor.cc b/chrome/browser/extensions/script_executor.cc
index 1009883f..92029e5 100644
--- a/chrome/browser/extensions/script_executor.cc
+++ b/chrome/browser/extensions/script_executor.cc
@@ -69,14 +69,13 @@ class Handler : public content::WebContentsObserver {
virtual void WebContentsDestroyed() OVERRIDE {
base::ListValue val;
- callback_.Run(kRendererDestroyed, -1, GURL(std::string()), val);
+ callback_.Run(kRendererDestroyed, GURL(std::string()), val);
delete this;
}
private:
void OnExecuteCodeFinished(int request_id,
const std::string& error,
- int32 on_page_id,
const GURL& on_url,
const base::ListValue& script_result) {
if (script_observers_.get() && error.empty()) {
@@ -85,11 +84,10 @@ class Handler : public content::WebContentsObserver {
FOR_EACH_OBSERVER(TabHelper::ScriptExecutionObserver, *script_observers_,
OnScriptsExecuted(web_contents(),
id_map,
- on_page_id,
on_url));
}
- callback_.Run(error, on_page_id, on_url, script_result);
+ callback_.Run(error, on_url, script_result);
delete this;
}
diff --git a/chrome/browser/extensions/script_executor.h b/chrome/browser/extensions/script_executor.h
index 644c70d..9804bf0 100644
--- a/chrome/browser/extensions/script_executor.h
+++ b/chrome/browser/extensions/script_executor.h
@@ -75,9 +75,10 @@ class ScriptExecutor {
JSON_SERIALIZED_RESULT,
};
- // Callback from ExecuteScript. The arguments are (error, on_page_id, on_url,
- // result). Success is implied by an empty error.
- typedef base::Callback<void(const std::string&, int32, const GURL&,
+ // Callback from ExecuteScript. The arguments are (error, on_url, result).
+ // Success is implied by an empty error.
+ typedef base::Callback<void(const std::string&,
+ const GURL&,
const base::ListValue&)>
ExecuteScriptCallback;
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index 4889d41..cf9090a 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -434,12 +434,10 @@ void TabHelper::OnRequest(const ExtensionHostMsg_Request_Params& request) {
void TabHelper::OnContentScriptsExecuting(
const ScriptExecutionObserver::ExecutingScriptsMap& executing_scripts_map,
- int32 on_page_id,
const GURL& on_url) {
FOR_EACH_OBSERVER(ScriptExecutionObserver, script_execution_observers_,
OnScriptsExecuted(web_contents(),
executing_scripts_map,
- on_page_id,
on_url));
}
diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h
index 75fc21a..6947021 100644
--- a/chrome/browser/extensions/tab_helper.h
+++ b/chrome/browser/extensions/tab_helper.h
@@ -79,7 +79,6 @@ class TabHelper : public content::WebContentsObserver,
virtual void OnScriptsExecuted(
const content::WebContents* web_contents,
const ExecutingScriptsMap& executing_scripts_map,
- int32 on_page_id,
const GURL& on_url) = 0;
protected:
@@ -204,7 +203,6 @@ class TabHelper : public content::WebContentsObserver,
void OnRequest(const ExtensionHostMsg_Request_Params& params);
void OnContentScriptsExecuting(
const ScriptExecutionObserver::ExecutingScriptsMap& extension_ids,
- int32 page_id,
const GURL& on_url);
void OnWatchedPageChange(const std::vector<std::string>& css_selectors);
void OnDetailedConsoleMessageAdded(const base::string16& message,
generated by cgit v1.1 at 2025-02-09 17:27:32 +0000