WebView context menu cleanup.

chrome/browser/extensions/menu_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_MENU_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_MENU_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 26 matching lines @@
 class Extension;
 class ExtensionRegistry;
 class StateStore;
 
 // Represents a menu item added by an extension.
 class MenuItem {
  public:
   // A list of MenuItems.
   typedef std::vector<MenuItem*> List;
 
-  // Key used to identify which extension a menu item belongs to.
-  // A menu item can also belong to a <webview> inside an extension,
-  // only in that case |webview_instance_id| would be
-  // non-zero (i.e. != guestview::kInstanceIDNone).
+  // Key used to identify which extension a menu item belongs to.  A menu item
+  // can also belong to a <webview>, in which case |webview_embedder_process_id|
+  // and |webview_instance_id| will be non-zero.
+
   struct ExtensionKey {
     std::string extension_id;
+    int webview_embedder_process_id;
     int webview_instance_id;
 
     ExtensionKey();
-    ExtensionKey(const std::string& extension_id, int webview_instance_id);
     explicit ExtensionKey(const std::string& extension_id);
+    ExtensionKey(int webview_embedder_process_id, int webview_instance_id);
+    ExtensionKey(const std::string& extension_id,

[Devlin, 2015/06/18 19:39:57]

If we allow matching based on view id and process id, in which circumstance do
we need to also provide an extension id with these other two?  I think it mostly
just confuses things... I think I'd rather see us use *either* extension id (for
extensions) *or* view/process id (for web views).

[paulmeyer, 2015/06/18 19:49:59]

Okay. If I were to use that approach, would you want to rename "ExtensionKey" to
something else, since it would sometimes not have any extension-specific data in
it?

[Devlin, 2015/06/18 20:09:21]

I think "Key" would be sufficient.  If it's not an obscene amount of churn, go
for it, otherwise a "TODO: This isn't restricted to extensions" would suffice.

[paulmeyer, 2015/06/19 17:57:28]

I made the change and left a TODO for now. I will also rename it to "Key", but I
believe that that is a large enough change to warrant being in a subsequent CL,
as it would likely just muddy this one. 

+                 int webview_embedder_process_id,
+                 int webview_instance_id);
 
     bool operator==(const ExtensionKey& other) const;
     bool operator!=(const ExtensionKey& other) const;
     bool operator<(const ExtensionKey& other) const;
 
     bool empty() const;
   };
 
   // An Id uniquely identifies a context menu item registered by an extension.
   struct Id {
@@ skipping 333 matching lines @@
 
   // Owned by ExtensionSystem.
   StateStore* store_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuManager);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_MENU_MANAGER_H_