Fix bug with context menus in incognito mode.

chrome/browser/extensions/extension_menu_manager.cc

 // Copyright (c) 2010 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/extension_menu_manager.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
@@ skipping 371 matching lines @@
   ExtensionMenuItem* item = GetItemById(menuItemId);
   if (!item)
     return;
 
   if (item->type() == ExtensionMenuItem::RADIO)
     RadioItemSelected(item);
 
   ListValue args;
 
   DictionaryValue* properties = new DictionaryValue();
-  properties->SetInteger("menuItemId", item->id().second);
+  properties->SetInteger("menuItemId", item->id().uid);
   if (item->parent_id())
-    properties->SetInteger("parentMenuItemId", item->parent_id()->second);
+    properties->SetInteger("parentMenuItemId", item->parent_id()->uid);
 
   switch (params.media_type) {
     case WebKit::WebContextMenuData::MediaTypeImage:
       properties->SetString("mediaType", "image");
       break;
     case WebKit::WebContextMenuData::MediaTypeVideo:
       properties->SetString("mediaType", "video");
       break;
     case WebKit::WebContextMenuData::MediaTypeAudio:
       properties->SetString("mediaType", "audio");
@@ skipping 59 matching lines @@
 const SkBitmap& ExtensionMenuManager::GetIconForExtension(
     const std::string& extension_id) {
   return icon_manager_.GetIcon(extension_id);
 }
 
 // static
 bool ExtensionMenuManager::HasAllowedScheme(const GURL& url) {
   URLPattern pattern(kAllowedSchemes);
   return pattern.SetScheme(url.scheme());
 }
+
+ExtensionMenuItem::Id::Id()
+    : profile(NULL), uid(0) {
+}
+
+ExtensionMenuItem::Id::Id(Profile* profile, std::string extension_id, int uid)
+    : profile(profile), extension_id(extension_id), uid(uid) {
+}
+
+ExtensionMenuItem::Id::~Id() {
+}
+
+bool ExtensionMenuItem::Id::operator==(const Id& other) const {
+  return (profile == other.profile &&
+          extension_id == other.extension_id &&
+          uid == other.uid);
+}
+
+bool ExtensionMenuItem::Id::operator!=(const Id& other) const {
+  return !(*this == other);
+}
+
+bool ExtensionMenuItem::Id::operator<(const Id& other) const {
+  if (profile < other.profile)
+    return true;
+  if (profile == other.profile) {
+    if (extension_id < other.extension_id)
+      return true;
+    if (extension_id == other.extension_id)
+      return uid < other.uid;
+  }
+  return false;
+}