Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(729)

Unified Diff: components/translate/content/renderer/translate_helper.cc

Issue 2628053003: Remove extension group from DOMWrapperWorld. (Closed)
Patch Set: Fix GCCallbackTest Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/translate/content/renderer/translate_helper.cc
diff --git a/components/translate/content/renderer/translate_helper.cc b/components/translate/content/renderer/translate_helper.cc
index 51d5cace8a59ec05ccc4c007c75717cc8cc38f3c..dc572fa14759152abb8ce7b92e35f80a1097748d 100644
--- a/components/translate/content/renderer/translate_helper.cc
+++ b/components/translate/content/renderer/translate_helper.cc
@@ -109,11 +109,9 @@ namespace translate {
// TranslateHelper, public:
TranslateHelper::TranslateHelper(content::RenderFrame* render_frame,
int world_id,
- int extension_group,
const std::string& extension_scheme)
: content::RenderFrameObserver(render_frame),
world_id_(world_id),
- extension_group_(extension_group),
extension_scheme_(extension_scheme),
binding_(this),
weak_method_factory_(this) {}
@@ -238,8 +236,7 @@ void TranslateHelper::ExecuteScript(const std::string& script) {
return;
WebScriptSource source = WebScriptSource(ASCIIToUTF16(script));
- main_frame->executeScriptInIsolatedWorld(
- world_id_, &source, 1, extension_group_);
+ main_frame->executeScriptInIsolatedWorld(world_id_, &source, 1);
}
bool TranslateHelper::ExecuteScriptAndGetBoolResult(const std::string& script,
@@ -251,8 +248,7 @@ bool TranslateHelper::ExecuteScriptAndGetBoolResult(const std::string& script,
v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
WebVector<v8::Local<v8::Value> > results;
WebScriptSource source = WebScriptSource(ASCIIToUTF16(script));
- main_frame->executeScriptInIsolatedWorld(
- world_id_, &source, 1, extension_group_, &results);
+ main_frame->executeScriptInIsolatedWorld(world_id_, &source, 1, &results);
if (results.size() != 1 || results[0].IsEmpty() || !results[0]->IsBoolean()) {
NOTREACHED();
return fallback;
@@ -270,8 +266,7 @@ std::string TranslateHelper::ExecuteScriptAndGetStringResult(
v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
WebVector<v8::Local<v8::Value> > results;
WebScriptSource source = WebScriptSource(ASCIIToUTF16(script));
- main_frame->executeScriptInIsolatedWorld(
- world_id_, &source, 1, extension_group_, &results);
+ main_frame->executeScriptInIsolatedWorld(world_id_, &source, 1, &results);
if (results.size() != 1 || results[0].IsEmpty() || !results[0]->IsString()) {
NOTREACHED();
return std::string();
@@ -293,8 +288,7 @@ double TranslateHelper::ExecuteScriptAndGetDoubleResult(
v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
WebVector<v8::Local<v8::Value> > results;
WebScriptSource source = WebScriptSource(ASCIIToUTF16(script));
- main_frame->executeScriptInIsolatedWorld(
- world_id_, &source, 1, extension_group_, &results);
+ main_frame->executeScriptInIsolatedWorld(world_id_, &source, 1, &results);
if (results.size() != 1 || results[0].IsEmpty() || !results[0]->IsNumber()) {
NOTREACHED();
return 0.0;
« no previous file with comments | « components/translate/content/renderer/translate_helper.h ('k') | content/public/renderer/render_frame_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698