Incognito-allowed package apps produce duplicate items in context menu

chrome/browser/extensions/menu_manager.cc

 // Copyright (c) 2012 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/menu_manager.h"
 
 #include <algorithm>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 791 matching lines @@
                      AsWeakPtr(), extension->id()));
     }
   }
 }
 
 const SkBitmap& MenuManager::GetIconForExtension(
     const std::string& extension_id) {
   return icon_manager_.GetIcon(extension_id);
 }
 
+void MenuManager::RemoveAllIncognitoContextItems() {
+  // Get all context menu items with "incognito" set to "split".
+  std::set<MenuItem::Id> items_to_remove;
+  std::map<MenuItem::Id, MenuItem*>::const_iterator iter;
+  for (iter = items_by_id_.begin();
+       iter != items_by_id_.end();
+       ++iter) {
+    if (iter->first.incognito)
+      items_to_remove.insert(iter->first);
+  }
+
+  std::set<MenuItem::Id>::iterator remove_iter;
+  for (remove_iter = items_to_remove.begin();
+       remove_iter != items_to_remove.end();
+       ++remove_iter)
+    RemoveContextMenuItem(*remove_iter);
+}
+
 MenuItem::Id::Id()
     : incognito(false), extension_id(""), uid(0), string_uid("") {
 }
 
 MenuItem::Id::Id(bool incognito, const std::string& extension_id)
     : incognito(incognito), extension_id(extension_id), uid(0),
       string_uid("") {
 }
 
 MenuItem::Id::~Id() {
@@ skipping 20 matching lines @@
       if (uid < other.uid)
         return true;
       if (uid == other.uid)
         return string_uid < other.string_uid;
     }
   }
   return false;
 }
 
 }  // namespace extensions