tabId support to chrome.extensions.getViews()

extensions/renderer/extension_frame_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/extension_frame_helper.h"
 
 #include "base/strings/string_util.h"
 #include "content/public/renderer/render_frame.h"
 #include "extensions/common/api/messaging/message.h"
 #include "extensions/common/constants.h"
@@ skipping 14 matching lines @@
 namespace {
 
 base::LazyInstance<std::set<const ExtensionFrameHelper*>> g_frame_helpers =
     LAZY_INSTANCE_INITIALIZER;
 
 // Returns true if the render frame corresponding with |frame_helper| matches
 // the given criteria.
 bool RenderFrameMatches(const ExtensionFrameHelper* frame_helper,
                         ViewType match_view_type,
                         int match_window_id,
+                        int match_tab_id,
                         const std::string& match_extension_id) {
   if (match_view_type != VIEW_TYPE_INVALID &&
       frame_helper->view_type() != match_view_type)
     return false;
 
   // Not all frames have a valid ViewType, e.g. devtools, most GuestViews, and
   // unclassified detached WebContents.
   if (frame_helper->view_type() == VIEW_TYPE_INVALID)
     return false;
 
   // This logic matches ExtensionWebContentsObserver::GetExtensionFromFrame.
   blink::WebSecurityOrigin origin =
       frame_helper->render_frame()->GetWebFrame()->getSecurityOrigin();
   if (origin.isUnique() ||
       !base::EqualsASCII(base::StringPiece16(origin.protocol()),
                          kExtensionScheme) ||
       !base::EqualsASCII(base::StringPiece16(origin.host()),
                          match_extension_id.c_str()))
     return false;
 
   if (match_window_id != extension_misc::kUnknownWindowId &&
       frame_helper->browser_window_id() != match_window_id)
     return false;
+
+  if (match_tab_id != extension_misc::kUnknownTabId &&
+      frame_helper->tab_id() != match_tab_id)
+    return false;
+
   return true;
 }
 
 // Runs every callback in |callbacks_to_be_run_and_cleared| while |frame_helper|
 // is valid, and clears |callbacks_to_be_run_and_cleared|.
 void RunCallbacksWhileFrameIsValid(
     base::WeakPtr<ExtensionFrameHelper> frame_helper,
     std::vector<base::Closure>* callbacks_to_be_run_and_cleared) {
   // The JavaScript code can cause re-entrancy. To avoid a deadlock, don't run
   // callbacks that are added during the iteration.
@@ skipping 22 matching lines @@
 }
 
 ExtensionFrameHelper::~ExtensionFrameHelper() {
   g_frame_helpers.Get().erase(this);
 }
 
 // static
 std::vector<content::RenderFrame*> ExtensionFrameHelper::GetExtensionFrames(
     const std::string& extension_id,
     int browser_window_id,
+    int tab_id,
     ViewType view_type) {
   std::vector<content::RenderFrame*> render_frames;
   for (const ExtensionFrameHelper* helper : g_frame_helpers.Get()) {
-    if (RenderFrameMatches(helper, view_type, browser_window_id, extension_id))
+    if (RenderFrameMatches(helper, view_type, browser_window_id, tab_id,
+                           extension_id))
       render_frames.push_back(helper->render_frame());
   }
   return render_frames;
 }
 
 // static
 content::RenderFrame* ExtensionFrameHelper::GetBackgroundPageFrame(
     const std::string& extension_id) {
   for (const ExtensionFrameHelper* helper : g_frame_helpers.Get()) {
     if (RenderFrameMatches(helper, VIEW_TYPE_EXTENSION_BACKGROUND_PAGE,
-                           extension_misc::kUnknownWindowId, extension_id)) {
+                           extension_misc::kUnknownWindowId,
+                           extension_misc::kUnknownTabId, extension_id)) {
       blink::WebLocalFrame* web_frame = helper->render_frame()->GetWebFrame();
       // Check if this is the top frame.
       if (web_frame->top() == web_frame)
         return helper->render_frame();
     }
   }
   return nullptr;
 }
 
 // static
@@ skipping 155 matching lines @@
   extension_dispatcher_->InvokeModuleSystemMethod(render_frame(), extension_id,
                                                   module_name, function_name,
                                                   args, user_gesture);
 }
 
 void ExtensionFrameHelper::OnDestruct() {
   delete this;
 }
 
 }  // namespace extensions