|Print..| menu should be consistent in contextmenu with and without selection.

chrome/browser/renderer_context_menu/render_view_context_menu.cc

 // Copyright 2014 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 "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 459 matching lines @@
         extensions::WebViewGuest::GetViewInstanceId(source_web_contents_));
     extension_items_.AppendExtensionItems(key,
                                           PrintableSelectionText(),
                                           &index,
                                           false);  // is_action_menu
   }
 }
 
 void RenderViewContextMenu::InitMenu() {
   RenderViewContextMenuBase::InitMenu();
-
+  bool rotation_item_appended = false;
   if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PAGE))
     AppendPageItems();
 
   if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_FRAME)) {
     // Merge in frame items with page items if we clicked within a frame that
     // needs them.
     menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
     AppendFrameItems();
   }
 
@@ skipping 23 matching lines @@
     AppendAudioItems();
   }
 
   if (content_type_->SupportsGroup(
           ContextMenuContentType::ITEM_GROUP_MEDIA_CANVAS)) {
     AppendCanvasItems();
   }
 
   if (content_type_->SupportsGroup(
           ContextMenuContentType::ITEM_GROUP_MEDIA_PLUGIN)) {
-    AppendPluginItems();
+    rotation_item_appended = AppendPluginItems();
   }
 
   // ITEM_GROUP_MEDIA_FILE has no specific items.
 
   if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_EDITABLE))
     AppendEditableItems();
 
   if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_COPY)) {
     DCHECK(!content_type_->SupportsGroup(
                ContextMenuContentType::ITEM_GROUP_EDITABLE));
     AppendCopyItem();
   }
 
   if (content_type_->SupportsGroup(
           ContextMenuContentType::ITEM_GROUP_SEARCH_PROVIDER)) {
     AppendSearchProvider();
   }
 
   if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PRINT))
     AppendPrintItem();
 
+  if (rotation_item_appended)
+    AppendRotationItems();
+
   if (content_type_->SupportsGroup(
           ContextMenuContentType::ITEM_GROUP_ALL_EXTENSION)) {
     DCHECK(!content_type_->SupportsGroup(
                ContextMenuContentType::ITEM_GROUP_CURRENT_EXTENSION));
     AppendAllExtensionItems();
   }
 
   if (content_type_->SupportsGroup(
           ContextMenuContentType::ITEM_GROUP_CURRENT_EXTENSION)) {
     DCHECK(!content_type_->SupportsGroup(
@@ skipping 198 matching lines @@
       media_flags & WebContextMenuData::MediaMuted ?
           IDS_CONTENT_CONTEXT_UNMUTE :
           IDS_CONTENT_CONTEXT_MUTE);
 
   menu_model_.AddCheckItemWithStringId(IDC_CONTENT_CONTEXT_LOOP,
                                        IDS_CONTENT_CONTEXT_LOOP);
   menu_model_.AddCheckItemWithStringId(IDC_CONTENT_CONTEXT_CONTROLS,
                                        IDS_CONTENT_CONTEXT_CONTROLS);
 }
 
-void RenderViewContextMenu::AppendPluginItems() {
+// This function will returns true if we need to add the rotation items else
+// returns false. As rotation items should be added after copy, search, print
+// context menu items.

[Avi (use Gerrit), 2014/10/08 12:42:48]

:\ When you return bool from a function it means success/no or maybe the
accessor of a feature. When I see bool returned here, it says to me "did this
function succeed at appending the plugin items?" which is not what it means. If
I were going this route I'd return a bool as a named parameter.

[Deepak, 2014/10/08 13:38:26]

Done.

+bool RenderViewContextMenu::AppendPluginItems() {
   if (params_.page_url == params_.src_url) {
     // Full page plugin, so show page menu items.
     if (params_.link_url.is_empty() && params_.selection_text.empty())
       AppendPageItems();
   } else {
     menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVEAVAS,
                                     IDS_CONTENT_CONTEXT_SAVEPAGEAS);
-    menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
+    // |IDC_PRINT| should be added here as we want print menu item when pdf
+    // launched with out of process flags then |content_type_->SupportsGroup|
+    // does not have |ContextMenuContentType::ITEM_GROUP_PRINT|.
+    if (!content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PRINT))
+      menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
   }
 
-  if (params_.media_flags & WebContextMenuData::MediaCanRotate) {
-    menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
-    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_ROTATECW,
-                                    IDS_CONTENT_CONTEXT_ROTATECW);
-    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_ROTATECCW,
-                                    IDS_CONTENT_CONTEXT_ROTATECCW);
-  }
+  if (params_.media_flags & WebContextMenuData::MediaCanRotate)
+    return true;

[Avi (use Gerrit), 2014/10/08 12:42:48]

Is there a reason why we need the boolean at all? Can we move this if() inside
of AppendRotationItems?

[Deepak, 2014/10/08 13:38:26]

Done.

+
+  return false;
 }
 
 void RenderViewContextMenu::AppendPageItems() {
   menu_model_.AddItemWithStringId(IDC_BACK, IDS_CONTENT_CONTEXT_BACK);
   menu_model_.AddItemWithStringId(IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD);
   menu_model_.AddItemWithStringId(IDC_RELOAD, IDS_CONTENT_CONTEXT_RELOAD);
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   menu_model_.AddItemWithStringId(IDC_SAVE_PAGE,
                                   IDS_CONTENT_CONTEXT_SAVEPAGEAS);
   menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
@@ skipping 38 matching lines @@
   if (menu_model_.GetIndexOfCommandId(IDC_PRINT) != -1)
     return;
 
   if (GetPrefs(browser_context_)->GetBoolean(prefs::kPrintingEnabled) &&
       (params_.media_type == WebContextMenuData::MediaTypeNone ||
        params_.media_flags & WebContextMenuData::MediaCanPrint)) {
     menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
   }
 }
 
+void RenderViewContextMenu::AppendRotationItems() {
+  menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_ROTATECW,
+                                  IDS_CONTENT_CONTEXT_ROTATECW);
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_ROTATECCW,
+                                  IDS_CONTENT_CONTEXT_ROTATECCW);
+}
+
 void RenderViewContextMenu::AppendSearchProvider() {
   DCHECK(browser_context_);
 
   base::TrimWhitespace(params_.selection_text, base::TRIM_ALL,
                        &params_.selection_text);
   if (params_.selection_text.empty())
     return;
 
   base::ReplaceChars(params_.selection_text, AutocompleteMatch::kInvalidChars,
                      base::ASCIIToUTF16(" "), &params_.selection_text);
@@ skipping 933 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);
 }