Platform app context menu items should not be grouped into a submenu.

chrome/browser/tab_contents/render_view_context_menu.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 <algorithm>
 #include <set>
 #include <utility>
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
@@ skipping 374 matching lines @@
       GetRelevantExtensionItems(*all_items, params_, profile_,
                                 can_cross_incognito);
   if (items.empty())
     return;
 
   // If this is the first extension-provided menu item, and there are other
   // items in the menu, add a separator.
   if (*index == 0 && menu_model_.GetItemCount())
     menu_model_.AddSeparator();
 
-  int menu_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST + (*index)++;
+  // Extensions (other than platform apps) are only allowed one top-level slot
+  // (and it can't be a radio or checkbox item because we are going to put the
+  // extension icon next to it).
+  // If they have more than that, we automatically push them into a submenu.
+  if (extension->is_platform_app()) {
+    RecursivelyAppendExtensionItems(items, can_cross_incognito, &menu_model_,
+                                    index);
+  } else {
+    int menu_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST + (*index)++;
+    string16 title;
+    MenuItem::List submenu_items;
 
-  // Extensions are only allowed one top-level slot (and it can't be a radio or
-  // checkbox item because we are going to put the extension icon next to it).
-  // If they have more than that, we automatically push them into a submenu.
-  string16 title;
-  MenuItem::List submenu_items;
-  if (items.size() > 1 || items[0]->type() != MenuItem::NORMAL) {
-    title = UTF8ToUTF16(extension->name());
-    submenu_items = items;
-  } else {
-    MenuItem* item = items[0];
-    extension_item_map_[menu_id] = item->id();
-    title = item->TitleWithReplacement(PrintableSelectionText(),
+    if (items.size() > 1 || items[0]->type() != MenuItem::NORMAL) {
+      title = UTF8ToUTF16(extension->name());
+      submenu_items = items;
+    } else {
+      MenuItem* item = items[0];
+      extension_item_map_[menu_id] = item->id();
+      title = item->TitleWithReplacement(PrintableSelectionText(),
                                        kMaxExtensionItemTitleLength);
-    submenu_items = GetRelevantExtensionItems(item->children(), params_,
+      submenu_items = GetRelevantExtensionItems(item->children(), params_,
                                               profile_, can_cross_incognito);
+    }
+
+    // Now add our item(s) to the menu_model_.
+    if (submenu_items.empty()) {
+      menu_model_.AddItem(menu_id, title);
+    } else {
+      ui::SimpleMenuModel* submenu = new ui::SimpleMenuModel(this);
+      extension_menu_models_.push_back(submenu);
+      menu_model_.AddSubMenu(menu_id, title, submenu);
+      RecursivelyAppendExtensionItems(submenu_items, can_cross_incognito,
+                                      submenu, index);
+    }
+    SetExtensionIcon(extension_id);
   }
-
-  // Now add our item(s) to the menu_model_.
-  if (submenu_items.empty()) {
-    menu_model_.AddItem(menu_id, title);
-  } else {
-    ui::SimpleMenuModel* submenu = new ui::SimpleMenuModel(this);
-    extension_menu_models_.push_back(submenu);
-    menu_model_.AddSubMenu(menu_id, title, submenu);
-    RecursivelyAppendExtensionItems(submenu_items, can_cross_incognito, submenu,
-                                    index);
-  }
-  SetExtensionIcon(extension_id);
 }
 
 void RenderViewContextMenu::RecursivelyAppendExtensionItems(
     const MenuItem::List& items,
     bool can_cross_incognito,
     ui::SimpleMenuModel* menu_model,
     int* index) {
   string16 selection_text = PrintableSelectionText();
   MenuItem::Type last_type = MenuItem::NORMAL;
   int radio_group_id = 1;
@@ skipping 1574 matching lines @@
   source_web_contents_->GetRenderViewHost()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }
 
 void RenderViewContextMenu::PluginActionAt(
     const gfx::Point& location,
     const WebPluginAction& action) {
   source_web_contents_->GetRenderViewHost()->
       ExecutePluginActionAtLocation(location, action);
 }