Show both custom and default menu items when selection is present.

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 "chrome/browser/tab_contents/render_view_context_menu.h"
 
 #include "base/command_line.h"
@@ skipping 491 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();
 
   if (AppendCustomItems()) {
-    // Don't add items for Pepper menu.
-    if (!params_.custom_context.is_pepper_menu)
-      AppendDeveloperItems();
-    return;
+    if (has_selection) {
+      menu_model_.AddSeparator();

[brettw, 2011/10/21 20:24:27]

I get it. Can we have a comment here like:
  // 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.

+    } else {
+      // Don't add items for Pepper menu.
+      if (!params_.custom_context.is_pepper_menu)
+        AppendDeveloperItems();
+      return;
+    }
   }
 
   // When no special node or text is selected and selection has no link,
   // show page items.
   if (params_.media_type == WebContextMenuData::MediaTypeNone &&
       !has_link &&
       !params_.is_editable &&
       !has_selection) {
     if (!params_.page_url.is_empty()) {
       bool is_devtools = IsDevToolsURL(params_.page_url);
@@ skipping 1433 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);
 }