Hide default context menu for platform apps.

chrome/browser/tab_contents/render_view_context_menu.cc

Index: chrome/browser/tab_contents/render_view_context_menu.cc
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index fe2ec8f9a13221c4a70a02fe3a583aad7412411d..7aae02a0babf8fe11b4050b085f4b6cb62dee93c 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -46,6 +46,7 @@
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
@@ -359,8 +360,9 @@ void RenderViewContextMenu::AppendExtensionItems(
   if (items.empty())
     return;
 
-  // If this is the first extension-provided menu item, add a separator.
-  if (*index == 0)
+  // 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)++;
@@ -510,6 +512,16 @@ void RenderViewContextMenu::InitMenu() {
   bool has_link = !params_.link_url.is_empty();
   bool has_selection = !params_.selection_text.empty();
 
+  Browser* active_browser = BrowserList::GetLastActive();

[asargent_no_longer_on_chrome, 2011/12/09 05:34:21]

nit: it's probably better to use BrowserList::FindBrowserWithTabContents here
instead of GetLastActive.

[benwells, 2011/12/12 05:30:39]

That's much better.

+  if (active_browser) {
+    const Extension* platform_app = active_browser->GetPlatformApp();

[asargent_no_longer_on_chrome, 2011/12/09 05:34:21]

Instead of having the GetPlatformApp method on the Browser class, would it make
sense to instead do:

ExtensionService* service =  profile_->GetExtensionService();
Extension* extension = service->GetInstalledApp(params_.src_url);
if (extension && extension->is_platform_app()) {
  ...
}

[benwells, 2011/12/12 05:30:39]

To use the URL I would have to look at page_url, not src_url - or that's what my
debugger tells me - and strip out the scheme. That's not a problem.

I was going to use the Browser::GetPlatformApp for another change I have under
development to handle Chrome accelerators differently. Also, will the page url
method work for platform apps which open other windows? I don't know if they can
do that yet but I think its on the list of things for platform apps to do.

I don't know which way is better, I'm happy to do it either way.

+    if (platform_app) {
+      int index = 0;
+      AppendExtensionItems(platform_app->id(), &index);
+      return;
+    }
+  }
+
   if (AppendCustomItems()) {
     // If there's a selection, don't early return when there are custom items,
     // but fall through to adding the normal ones after the custom ones.