Add frameId to contextMenus.onClicked / onclick.

chrome/browser/extensions/menu_manager.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/menu_manager.h"
 
 #include <algorithm>
 #include <tuple>
 #include <utility>
 
@@ skipping 10 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/chrome_web_view_internal.h"
 #include "chrome/common/extensions/api/context_menus.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/context_menu_params.h"
 #include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_api_frame_id_map.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
 #include "extensions/browser/state_store.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/text_elider.h"
 
 using content::ChildProcessHost;
 using content::WebContents;
@@ skipping 569 matching lines @@
 }
 
 static void AddURLProperty(base::DictionaryValue* dictionary,
                            const std::string& key, const GURL& url) {
   if (!url.is_empty())
     dictionary->SetString(key, url.possibly_invalid_spec());
 }
 
 void MenuManager::ExecuteCommand(content::BrowserContext* context,
                                  WebContents* web_contents,
+                                 content::RenderFrameHost* render_frame_host,
                                  const content::ContextMenuParams& params,
                                  const MenuItem::Id& menu_item_id) {
   EventRouter* event_router = EventRouter::Get(context);
   if (!event_router)
     return;
 
   MenuItem* item = GetItemById(menu_item_id);
   if (!item)
     return;
 
@@ skipping 42 matching lines @@
                            webview_guest->view_instance_id());
   }
 
   args->Append(properties);
 
   // Add the tab info to the argument list.
   // No tab info in a platform app.
   if (!extension || !extension->is_platform_app()) {
     // Note: web_contents are NULL in unit tests :(
     if (web_contents) {
+      int frame_id = ExtensionApiFrameIdMap::GetFrameId(render_frame_host);
+      if (frame_id != ExtensionApiFrameIdMap::kInvalidFrameId)
+        properties->SetInteger("frameId", frame_id);
+
       args->Append(
           ExtensionTabUtil::CreateTabObject(web_contents)->ToValue().release());
     } else {
       args->Append(new base::DictionaryValue());
     }
   }
 
   if (item->type() == MenuItem::CHECKBOX ||
       item->type() == MenuItem::RADIO) {
     bool was_checked = item->checked();
@@ skipping 288 matching lines @@
 bool MenuItem::Id::operator!=(const Id& other) const {
   return !(*this == other);
 }
 
 bool MenuItem::Id::operator<(const Id& other) const {
   return std::tie(incognito, extension_key, uid, string_uid) <
     std::tie(other.incognito, other.extension_key, other.uid, other.string_uid);
 }
 
 }  // namespace extensions