Hide default context menu for platform apps.

chrome/browser/tab_contents/render_view_context_menu.cc

 // Copyright (c) 2011 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 28 matching lines @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_host.h"
 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
 #include "chrome/browser/tab_contents/spellchecker_submenu_observer.h"
 #include "chrome/browser/tab_contents/spelling_menu_observer.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #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"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/print_messages.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/download/download_manager.h"
@@ skipping 293 matching lines @@
   const ExtensionMenuItem::List* all_items = manager->MenuItems(extension_id);
   if (!all_items || all_items->empty())
     return;
   bool can_cross_incognito = service->CanCrossIncognito(extension);
   ExtensionMenuItem::List items =
       GetRelevantExtensionItems(*all_items, params_, profile_,
                                 can_cross_incognito);
   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)++;
 
   // 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;
   ExtensionMenuItem::List submenu_items;
   if (items.size() > 1 || items[0]->type() != ExtensionMenuItem::NORMAL) {
@@ skipping 129 matching lines @@
   }
   UMA_HISTOGRAM_TIMES("Extensions.ContextMenus_BuildTime",
                       base::TimeTicks::Now() - begin);
   UMA_HISTOGRAM_COUNTS("Extensions.ContextMenus_ItemCount", index);
 }
 
 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.
     if (has_selection) {
       menu_model_.AddSeparator();
     } else {
       // Don't add items for Pepper menu.
       if (!params_.custom_context.is_pepper_menu)
         AppendDeveloperItems();
       return;
@@ skipping 1305 matching lines @@
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
       g_browser_process->clipboard());
 }
 
 void RenderViewContextMenu::MediaPlayerActionAt(
     const gfx::Point& location,
     const WebMediaPlayerAction& action) {
   source_tab_contents_->render_view_host()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }