Index: chrome/browser/extensions/script_executor.cc |
diff --git a/chrome/browser/extensions/script_executor.cc b/chrome/browser/extensions/script_executor.cc |
index 45f6fc5530a20e429aa06e26beaf4004c97b584a..c8a763b59d92b0e0d30b3317cc297c5e9643a39c 100644 |
--- a/chrome/browser/extensions/script_executor.cc |
+++ b/chrome/browser/extensions/script_executor.cc |
@@ -7,6 +7,11 @@ |
#include "base/callback.h" |
#include "base/logging.h" |
#include "base/pickle.h" |
+#include "chrome/browser/extensions/active_script_controller.h" |
+#include "chrome/browser/extensions/location_bar_controller.h" |
+#include "chrome/browser/extensions/tab_helper.h" |
+#include "content/public/browser/navigation_controller.h" |
+#include "content/public/browser/navigation_entry.h" |
#include "content/public/browser/render_view_host.h" |
#include "content/public/browser/web_contents.h" |
#include "content/public/browser/web_contents_observer.h" |
@@ -120,6 +125,14 @@ void ScriptExecutor::ExecuteScript(const std::string& extension_id, |
bool user_gesture, |
ScriptExecutor::ResultType result_type, |
const ExecuteScriptCallback& callback) { |
+ LocationBarController* location_bar_controller = |
+ TabHelper::FromWebContents(web_contents_)->location_bar_controller(); |
+ // TODO(rdevlin.cronin): Now, this is just a notification. Soon, it should |
+ // block until the user gives the OK to execute. |
+ location_bar_controller->active_script_controller()->NotifyScriptExecuting( |
+ extension_id, |
+ web_contents_->GetController().GetVisibleEntry()->GetPageID()); |
not at google - send to devlin
2014/05/08 20:47:09
now I remember why the old code implemented Script
Devlin
2014/05/08 23:01:00
Yeah, I was debating it. But wanted to keep the C
|
+ |
ExtensionMsg_ExecuteCode_Params params; |
params.request_id = next_request_id_++; |
params.extension_id = extension_id; |