Fix bug with context menus in incognito mode.

chrome/browser/extensions/extension_context_menu_api.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_context_menu_api.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "base/string_number_conversions.h"
@@ skipping 156 matching lines @@
                         &target_url_patterns))
     return false;
 
   if (!target_url_patterns.is_empty()) {
     item->set_target_url_patterns(target_url_patterns);
   }
 
   return true;
 }
 
-
 bool ExtensionContextMenuFunction::GetParent(
     const DictionaryValue& properties,
     const ExtensionMenuManager& manager,
     ExtensionMenuItem** result) {
   if (!properties.HasKey(kParentIdKey))
     return true;
-  ExtensionMenuItem::Id parent_id(extension_id(), 0);
+  ExtensionMenuItem::Id parent_id(profile(), extension_id(), 0);
   if (properties.HasKey(kParentIdKey) &&
-      !properties.GetInteger(kParentIdKey, &parent_id.second))
+      !properties.GetInteger(kParentIdKey, &parent_id.uid))
     return false;
 
   ExtensionMenuItem* parent = manager.GetItemById(parent_id);
   if (!parent) {
     error_ = "Cannot find menu item with id " +
-        base::IntToString(parent_id.second);
+        base::IntToString(parent_id.uid);
     return false;
   }
   if (parent->type() != ExtensionMenuItem::NORMAL) {
     error_ = kParentsMustBeNormalError;
     return false;
   }
   *result = parent;
   return true;
 }
 
 bool CreateContextMenuFunction::RunImpl() {
   DictionaryValue* properties;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &properties));
   EXTENSION_FUNCTION_VALIDATE(properties != NULL);
 
-  ExtensionMenuItem::Id id(extension_id(), 0);
+  ExtensionMenuItem::Id id(profile(), extension_id(), 0);
   EXTENSION_FUNCTION_VALIDATE(properties->GetInteger(kGeneratedIdKey,
-                                                     &id.second));
+                                                     &id.uid));
   std::string title;
   if (properties->HasKey(kTitleKey) &&
       !properties->GetString(kTitleKey, &title))
     return false;
 
   ExtensionMenuManager* menu_manager =
       profile()->GetExtensionsService()->menu_manager();
 
   ExtensionMenuItem::ContextList contexts(ExtensionMenuItem::PAGE);
   if (!ParseContexts(*properties, kContextsKey, &contexts))
@@ skipping 13 matching lines @@
     return false;
 
   scoped_ptr<ExtensionMenuItem> item(
       new ExtensionMenuItem(id, title, checked, type, contexts));
 
   if (!SetURLPatterns(*properties, item.get()))
     return false;
 
   bool success = true;
   if (properties->HasKey(kParentIdKey)) {
-    ExtensionMenuItem::Id parent_id(extension_id(), 0);
+    ExtensionMenuItem::Id parent_id(profile(), extension_id(), 0);
     EXTENSION_FUNCTION_VALIDATE(properties->GetInteger(kParentIdKey,
-                                                       &parent_id.second));
+                                                       &parent_id.uid));
     ExtensionMenuItem* parent = menu_manager->GetItemById(parent_id);
     if (!parent) {
       error_ = ExtensionErrorUtils::FormatErrorMessage(
-          kCannotFindItemError, base::IntToString(parent_id.second));
+          kCannotFindItemError, base::IntToString(parent_id.uid));
       return false;
     }
     if (parent->type() != ExtensionMenuItem::NORMAL) {
       error_ = kParentsMustBeNormalError;
       return false;
     }
     success = menu_manager->AddChildItem(parent_id, item.release());
   } else {
     success = menu_manager->AddContextItem(GetExtension(), item.release());
   }
 
   if (!success)
     return false;
 
   return true;
 }
 
 bool UpdateContextMenuFunction::RunImpl() {
-  ExtensionMenuItem::Id item_id(extension_id(), 0);
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &item_id.second));
+  ExtensionMenuItem::Id item_id(profile(), extension_id(), 0);
+  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &item_id.uid));
 
   ExtensionsService* service = profile()->GetExtensionsService();
   ExtensionMenuManager* manager = service->menu_manager();
   ExtensionMenuItem* item = manager->GetItemById(item_id);
   if (!item || item->extension_id() != extension_id()) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
-        kCannotFindItemError, base::IntToString(item_id.second));
+        kCannotFindItemError, base::IntToString(item_id.uid));
     return false;
   }
 
   DictionaryValue *properties = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &properties));
   EXTENSION_FUNCTION_VALIDATE(properties != NULL);
 
   ExtensionMenuManager* menu_manager =
       profile()->GetExtensionsService()->menu_manager();
 
@@ skipping 38 matching lines @@
   if (parent && !menu_manager->ChangeParent(item->id(), &parent->id()))
     return false;
 
   if (!SetURLPatterns(*properties, item))
     return false;
 
   return true;
 }
 
 bool RemoveContextMenuFunction::RunImpl() {
-  ExtensionMenuItem::Id id(extension_id(), 0);
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &id.second));
+  ExtensionMenuItem::Id id(profile(), extension_id(), 0);
+  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &id.uid));
   ExtensionsService* service = profile()->GetExtensionsService();
   ExtensionMenuManager* manager = service->menu_manager();
 
   ExtensionMenuItem* item = manager->GetItemById(id);
   // Ensure one extension can't remove another's menu items.
   if (!item || item->extension_id() != extension_id()) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
-        kCannotFindItemError, base::IntToString(id.second));
+        kCannotFindItemError, base::IntToString(id.uid));
     return false;
   }
 
   return manager->RemoveContextMenuItem(id);
 }
 
 bool RemoveAllContextMenusFunction::RunImpl() {
   ExtensionsService* service = profile()->GetExtensionsService();
   ExtensionMenuManager* manager = service->menu_manager();
   manager->RemoveAllContextItems(extension_id());
   return true;
 }