Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Unified Diff: chrome/browser/renderer_context_menu/render_view_context_menu.cc

Issue 597933002: Restored disable print preview policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Thu Sep 25 18:19:02 PDT 2014 Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f6fa9d6fc798b9843af29893c69b7603e1a73620..b0aa4fec544f8762a7ad9d77c1eae872f6f2fbb8 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -1478,32 +1478,41 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
break;
}
- case IDC_PRINT:
+ case IDC_PRINT: {
#if defined(ENABLE_PRINTING)
- 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 (params_.media_type != WebContextMenuData::MediaTypeNone) {
if (render_frame_host) {
render_frame_host->Send(new PrintMsg_PrintNodeUnderContextMenu(
render_frame_host->GetRoutingID()));
}
+ break;
}
-#endif // defined(ENABLE_PRINTING)
+
+#if defined(ENABLE_FULL_PRINTING)
+ printing::PrintViewManager* print_view_manager =
+ printing::PrintViewManager::FromWebContents(source_web_contents_);
+ if (!print_view_manager)
+ break;
+ if (!GetPrefs(browser_context_)
+ ->GetBoolean(prefs::kPrintPreviewDisabled)) {
+ print_view_manager->PrintPreviewNow(!params_.selection_text.empty());
+ break;
+ }
+#else // ENABLE_FULL_PRINTING
+ printing::PrintViewManagerBasic* print_view_manager =
+ printing::PrintViewManagerBasic::FromWebContents(
+ source_web_contents_);
+ if (!print_view_manager)
+ break;
+#endif // ENABLE_FULL_PRINTING
+
+#if !defined(DISABLE_BASIC_PRINTING)
+ print_view_manager->PrintNow();
+#endif // !DISABLE_BASIC_PRINTING
+
+#endif // ENABLE_PRINTING
break;
+ }
case IDC_VIEW_SOURCE:
source_web_contents_->ViewSource();
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698