WebView context menu cleanup.

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 "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 865 matching lines @@
       items_to_remove.insert(iter->first);
   }
 
   std::set<MenuItem::Id>::iterator remove_iter;
   for (remove_iter = items_to_remove.begin();
        remove_iter != items_to_remove.end();
        ++remove_iter)
     RemoveContextMenuItem(*remove_iter);
 }
 
-MenuItem::ExtensionKey::ExtensionKey() : webview_instance_id(0) {}
-
-MenuItem::ExtensionKey::ExtensionKey(const std::string& extension_id,
-                                     int webview_instance_id)
-    : extension_id(extension_id), webview_instance_id(webview_instance_id) {}
+MenuItem::ExtensionKey::ExtensionKey()
+    : webview_embedder_process_id(0), webview_instance_id(0) {}
 
 MenuItem::ExtensionKey::ExtensionKey(const std::string& extension_id)
-    : extension_id(extension_id), webview_instance_id(0) {}
+    : extension_id(extension_id),
+      webview_embedder_process_id(0),
+      webview_instance_id(0) {
+  DCHECK(!extension_id.empty());
+}
+
+MenuItem::ExtensionKey::ExtensionKey(int webview_embedder_process_id,
+                                     int webview_instance_id)
+    : webview_embedder_process_id(webview_embedder_process_id),
+      webview_instance_id(webview_instance_id) {
+  DCHECK(webview_embedder_process_id && webview_instance_id);
+}
 
 bool MenuItem::ExtensionKey::operator==(const ExtensionKey& other) const {
   return extension_id == other.extension_id &&
-         webview_instance_id == other.webview_instance_id;
+      webview_instance_id == other.webview_instance_id &&
+      webview_embedder_process_id == other.webview_embedder_process_id;
 }
 
 bool MenuItem::ExtensionKey::operator<(const ExtensionKey& other) const {
-  if (extension_id != other.extension_id)
-    return extension_id < other.extension_id;
+  if (webview_embedder_process_id != other.webview_embedder_process_id)
+    return webview_embedder_process_id < other.webview_embedder_process_id;
 
-  return webview_instance_id < other.webview_instance_id;
+  if (webview_instance_id != other.webview_instance_id)
+    return webview_instance_id < other.webview_instance_id;
+
+  return extension_id < other.extension_id;

[lazyboy, 2015/06/19 20:34:59]

Is there any reason why you put this at the end? in other operators this is the
primary key that we use for comparison. Please move it back to first if there
isn't any specific reason. I can only assumed you want to reduce string
comparison?

[paulmeyer, 2015/06/23 13:43:28]

Done.

 }
 
 bool MenuItem::ExtensionKey::operator!=(const ExtensionKey& other) const {
   return !(*this == other);
 }
 
 bool MenuItem::ExtensionKey::empty() const {
-  return extension_id.empty() && !webview_instance_id;
+  return extension_id.empty() && !webview_embedder_process_id &&
+         !webview_instance_id;
 }
 
 MenuItem::Id::Id() : incognito(false), uid(0) {}
 
 MenuItem::Id::Id(bool incognito, const MenuItem::ExtensionKey& extension_key)
     : incognito(incognito), extension_key(extension_key), uid(0) {}
 
 MenuItem::Id::~Id() {
 }
 
@@ skipping 17 matching lines @@
       if (uid < other.uid)
         return true;
       if (uid == other.uid)
         return string_uid < other.string_uid;
     }
   }
   return false;
 }
 
 }  // namespace extensions