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

Side by Side Diff: extensions/renderer/native_extension_bindings_system.cc

Issue 2522763005: [Extensions] Remove the source_tab_id property on API request messages (Closed)
Patch Set: compile Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/renderer/native_extension_bindings_system.h" 5 #include "extensions/renderer/native_extension_bindings_system.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/public/common/content_switches.h" 8 #include "content/public/common/content_switches.h"
9 #include "extensions/common/constants.h" 9 #include "extensions/common/constants.h"
10 #include "extensions/common/extension_api.h" 10 #include "extensions/common/extension_api.h"
11 #include "extensions/common/extension_messages.h" 11 #include "extensions/common/extension_messages.h"
12 #include "extensions/common/features/feature_provider.h" 12 #include "extensions/common/features/feature_provider.h"
13 #include "extensions/renderer/extension_frame_helper.h"
14 #include "extensions/renderer/script_context.h" 13 #include "extensions/renderer/script_context.h"
15 #include "extensions/renderer/script_context_set.h" 14 #include "extensions/renderer/script_context_set.h"
16 #include "gin/converter.h" 15 #include "gin/converter.h"
17 #include "third_party/WebKit/public/web/WebDocument.h" 16 #include "third_party/WebKit/public/web/WebDocument.h"
18 #include "third_party/WebKit/public/web/WebLocalFrame.h" 17 #include "third_party/WebKit/public/web/WebLocalFrame.h"
19 18
20 namespace extensions { 19 namespace extensions {
21 20
22 namespace { 21 namespace {
23 22
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 ScriptContext* script_context = 172 ScriptContext* script_context =
174 ScriptContextSet::GetContextByV8Context(context); 173 ScriptContextSet::GetContextByV8Context(context);
175 174
176 GURL url; 175 GURL url;
177 blink::WebLocalFrame* frame = script_context->web_frame(); 176 blink::WebLocalFrame* frame = script_context->web_frame();
178 if (frame && !frame->document().isNull()) 177 if (frame && !frame->document().isNull())
179 url = frame->document().url(); 178 url = frame->document().url();
180 else 179 else
181 url = script_context->url(); 180 url = script_context->url();
182 181
183 int tab_id = -1;
184 if (content::RenderFrame* render_frame = script_context->GetRenderFrame()) {
185 ExtensionFrameHelper* frame_helper =
186 ExtensionFrameHelper::Get(render_frame);
187 DCHECK(frame_helper);
188 tab_id = frame_helper->tab_id();
189 }
190
191 ExtensionHostMsg_Request_Params params; 182 ExtensionHostMsg_Request_Params params;
192 params.name = request->method_name; 183 params.name = request->method_name;
193 params.arguments.Swap(request->arguments.get()); 184 params.arguments.Swap(request->arguments.get());
194 params.extension_id = script_context->GetExtensionID(); 185 params.extension_id = script_context->GetExtensionID();
195 params.source_url = url; 186 params.source_url = url;
196 params.source_tab_id = tab_id;
197 params.request_id = request->request_id; 187 params.request_id = request->request_id;
198 params.has_callback = request->has_callback; 188 params.has_callback = request->has_callback;
199 params.user_gesture = request->has_user_gesture; 189 params.user_gesture = request->has_user_gesture;
200 // TODO(devlin): Make this work in ServiceWorkers. 190 // TODO(devlin): Make this work in ServiceWorkers.
201 params.worker_thread_id = -1; 191 params.worker_thread_id = -1;
202 params.service_worker_version_id = kInvalidServiceWorkerVersionId; 192 params.service_worker_version_id = kInvalidServiceWorkerVersionId;
203 193
204 send_ipc_.Run(script_context, params); 194 send_ipc_.Run(script_context, params);
205 } 195 }
206 196
207 } // namespace extensions 197 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/extension_messages.h ('k') | extensions/renderer/native_extension_bindings_system_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698