From 5a7b5eaf2d0c6036a6e13767050d5fb9e6d771ef Mon Sep 17 00:00:00 2001 From: "mpcomplete@chromium.org" Date: Tue, 2 Nov 2010 20:52:19 +0000 Subject: Fix bug with context menus in incognito mode. If an extension uses "spanning" mode, the context menu items are shared between profiles. If an extension uses "split" mode, the items are separate per profile. In either case, they only appear in incognito if the extension is enabled in incognito. Also fixed a minor bug, so that tabs.create now can open extension URLs in incognito if the extension uses split mode. BUG=61147 TEST=see bug for repro steps; context menu items should work in incognito mode Review URL: http://codereview.chromium.org/4090011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64812 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_menu_manager_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/extensions/extension_menu_manager_unittest.cc') diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc index 549c245..cbd9a52 100644 --- a/chrome/browser/extensions/extension_menu_manager_unittest.cc +++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc @@ -37,7 +37,7 @@ class ExtensionMenuManagerTest : public testing::Test { ExtensionMenuItem* CreateTestItem(Extension* extension) { ExtensionMenuItem::Type type = ExtensionMenuItem::NORMAL; ExtensionMenuItem::ContextList contexts(ExtensionMenuItem::ALL); - ExtensionMenuItem::Id id(extension->id(), next_id_++); + ExtensionMenuItem::Id id(NULL, extension->id(), next_id_++); return new ExtensionMenuItem(id, "test", false, type, contexts); } @@ -94,7 +94,7 @@ TEST_F(ExtensionMenuManagerTest, AddGetRemoveItems) { ASSERT_EQ(2u, manager_.MenuItems(extension_id)->size()); // Make sure removing a non-existent item returns false. - ExtensionMenuItem::Id id(extension->id(), id3.second + 50); + ExtensionMenuItem::Id id(NULL, extension->id(), id3.uid + 50); ASSERT_FALSE(manager_.RemoveContextMenuItem(id)); } @@ -461,7 +461,7 @@ TEST_F(ExtensionMenuManagerTest, ExecuteCommand) { int tmp_id = 0; ASSERT_TRUE(info->GetInteger("menuItemId", &tmp_id)); - ASSERT_EQ(id.second, tmp_id); + ASSERT_EQ(id.uid, tmp_id); std::string tmp; ASSERT_TRUE(info->GetString("mediaType", &tmp)); -- cgit v1.1