Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc |
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
index b0ba3483ef8183fef1d5c8bc0b58856c1a8a1391..f6fa9d6fc798b9843af29893c69b7603e1a73620 100644 |
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
@@ -1478,36 +1478,32 @@ |
break; |
} |
- case IDC_PRINT: { |
+ case IDC_PRINT: |
#if defined(ENABLE_PRINTING) |
- if (params_.media_type != WebContextMenuData::MediaTypeNone) { |
+ if (params_.media_type == WebContextMenuData::MediaTypeNone) { |
+#if defined(ENABLE_FULL_PRINTING) |
+ printing::PrintViewManager* print_view_manager = |
+ printing::PrintViewManager::FromWebContents(source_web_contents_); |
+ |
+ if (!print_view_manager) |
+ break; |
+ print_view_manager->PrintPreviewNow(!params_.selection_text.empty()); |
+#else |
+ printing::PrintViewManagerBasic* print_view_manager = |
+ printing::PrintViewManagerBasic::FromWebContents( |
+ source_web_contents_); |
+ if (!print_view_manager) |
+ break; |
+ print_view_manager->PrintNow(); |
+#endif // defined(ENABLE_FULL_PRINTING) |
+ } else { |
if (render_frame_host) { |
render_frame_host->Send(new PrintMsg_PrintNodeUnderContextMenu( |
render_frame_host->GetRoutingID())); |
} |
- return; |
} |
- |
- printing::PrintViewManager* print_view_manager = |
- printing::PrintViewManager::FromWebContents(source_web_contents_); |
- if (!print_view_manager) |
- break; |
- |
-#if defined(ENABLE_FULL_PRINTING) |
- if (!GetPrefs(browser_context_) |
- ->GetBoolean(prefs::kPrintPreviewDisabled)) { |
- print_view_manager->PrintPreviewNow(!params_.selection_text.empty()); |
- break; |
- } |
-#endif // ENABLE_FULL_PRINTING |
- |
-#if !defined(DISABLE_BASIC_PRINTING) |
- print_view_manager->PrintNow(); |
-#endif // !DISABLE_BASIC_PRINTING |
- |
-#endif // ENABLE_PRINTING |
- break; |
- } |
+#endif // defined(ENABLE_PRINTING) |
+ break; |
case IDC_VIEW_SOURCE: |
source_web_contents_->ViewSource(); |