Incognito-allowed package apps produce duplicate items in context menu

chrome/browser/extensions/extension_process_manager.cc

Index: chrome/browser/extensions/extension_process_manager.cc
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index 6a2a88f720126915fbdb8b8eb973fe0726d4bbe3..2ae905b20a6a0a483c50ebb03ad9661b63839c61 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -66,7 +66,7 @@ std::string GetExtensionID(RenderViewHost* render_view_host) {
 class IncognitoExtensionProcessManager : public ExtensionProcessManager {
  public:
   explicit IncognitoExtensionProcessManager(Profile* profile);
-  virtual ~IncognitoExtensionProcessManager() {}
+  virtual ~IncognitoExtensionProcessManager();
   virtual ExtensionHost* CreateViewHost(
       const Extension* extension,
       const GURL& url,
@@ -822,3 +822,11 @@ void IncognitoExtensionProcessManager::Observe(
       break;
   }
 }
+
+IncognitoExtensionProcessManager::~IncognitoExtensionProcessManager() {

[Yoyo Zhou, 2012/10/29 22:23:40]

Please keep the function definitions in the same order as the declarations. (You
can also move ExtensionProcessManager::ViewSet to a more correct location in
this file.)

[Joe Thomas, 2012/10/29 23:04:42]

Done.

Apparently there are other functions in ExtensionProcessManager and
IncognitoExtensionProcessManager which are out-of-order. I will create a CL to
correct that once this lands. 

+  // TODO(yoz): This cleanup code belongs in the MenuManager.
+  // Remove "incognito" "split" mode context menu items.
+  ExtensionService* service =
+      extensions::ExtensionSystem::Get(GetProfile())->extension_service();
+  service->menu_manager()->RemoveAllIncognitoContextItems();
+}