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

BUG=141898


Review URL: https://chromiumcodereview.appspot.com/10832349

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153585 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/platform_app_browsertest.cc

@@ -95,7 +95,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenu) {
   // launched a window.
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
-  // The context_menu app has one context menu item. This, along with a
+  // The context_menu app has two context menu items. These, along with a
   // separator and the developer tools, is all that should be in the menu.
   WebContents* web_contents = GetFirstShellWindowWebContents();
   ASSERT_TRUE(web_contents);
@@ -105,6 +105,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenu) {
       params);
   menu->Init();
   ASSERT_TRUE(menu->HasCommandWithId(IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST));
+  ASSERT_TRUE(menu->HasCommandWithId(IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST + 1));
   ASSERT_TRUE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_INSPECTELEMENT));
   ASSERT_TRUE(menu->HasCommandWithId(IDC_RELOAD));
   ASSERT_FALSE(menu->HasCommandWithId(IDC_BACK));

chrome/browser/tab_contents/render_view_context_menu.cc

@@ -392,36 +392,42 @@ void RenderViewContextMenu::AppendExtensionItems(
   if (*index == 0 && menu_model_.GetItemCount())
     menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
 
-  int menu_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST + (*index)++;
-
-  // 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).
+  // 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.
-  string16 title;
-  MenuItem::List submenu_items;
-  if (items.size() > 1 || items[0]->type() != MenuItem::NORMAL) {
-    title = UTF8ToUTF16(extension->name());
-    submenu_items = items;
+  if (extension->is_platform_app()) {
+    RecursivelyAppendExtensionItems(items, can_cross_incognito, &menu_model_,
+                                    index);
   } else {
-    MenuItem* item = items[0];
-    extension_item_map_[menu_id] = item->id();
-    title = item->TitleWithReplacement(PrintableSelectionText(),
+    int menu_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST + (*index)++;
+    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(),
                                        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);
+    // 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);
   }
-  SetExtensionIcon(extension_id);
 }
 
 void RenderViewContextMenu::RecursivelyAppendExtensionItems(

chrome/test/data/extensions/platform_apps/context_menu/test.js

@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 chrome.app.runtime.onLaunched.addListener(function() {
-  chrome.contextMenus.create({
-        id: 'id1',
-        title: 'Extension Item 1',
-      },
-      function() {
-        chrome.app.window.create('main.html', {}, function() {});
-      });
+  chrome.contextMenus.create({title: 'Extension Item 1',
+                             id: 'id1'}, function() {
+    chrome.contextMenus.create({title: 'Extension Item 2',
+                               id: 'id2'}, function() {
+      chrome.app.window.create('main.html', {}, function() {});
+    });
+  });
 });