Fix bug with context menus in incognito mode.

chrome/browser/extensions/extension_menu_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_MENU_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MENU_MANAGER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 15 matching lines @@
 class Profile;
 class SkBitmap;
 class TabContents;
 
 // Represents a menu item added by an extension.
 class ExtensionMenuItem {
  public:
   // A list of ExtensionMenuItem's.
   typedef std::vector<ExtensionMenuItem*> List;
 
-  // An Id is a pair of |extension id|, |int| where the |int| is unique per
-  // extension.
-  typedef std::pair<std::string, int> Id;
+  // An Id uniquely identifies a context menu item registered by an extension.
+  struct Id {
+    Id();
+    Id(Profile* profile, std::string extension_id, int uid);
+    ~Id();
+
+    bool operator==(const Id& other) const;
+    bool operator!=(const Id& other) const;
+    bool operator<(const Id& other) const;
+
+    Profile* profile;
+    std::string extension_id;
+    int uid;
+  };
 
   // For context menus, these are the contexts where an item can appear.
   enum Context {
     ALL = 1,
     PAGE = 2,
     SELECTION = 4,
     LINK = 8,
     EDITABLE = 16,
     IMAGE = 32,
     VIDEO = 64,
@@ skipping 37 matching lines @@
 
    private:
     uint32 value_;  // A bitmask of Context values.
   };
 
   ExtensionMenuItem(const Id& id, std::string title, bool checked, Type type,
                     const ContextList& contexts);
   virtual ~ExtensionMenuItem();
 
   // Simple accessor methods.
-  const std::string& extension_id() const { return id_.first; }
+  const std::string& extension_id() const { return id_.extension_id; }
   const std::string& title() const { return title_; }
   const List& children() { return children_; }
   const Id& id() const { return id_; }
   Id* parent_id() const { return parent_id_.get(); }
   int child_count() const { return children_.size(); }
   ContextList contexts() const { return contexts_; }
   Type type() const { return type_; }
   bool checked() const { return checked_; }
   const ExtensionExtent& document_url_patterns() const {
     return document_url_patterns_;
@@ skipping 157 matching lines @@
   std::map<ExtensionMenuItem::Id, ExtensionMenuItem*> items_by_id_;
 
   NotificationRegistrar registrar_;
 
   ExtensionIconManager icon_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionMenuManager);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_MENU_MANAGER_H_