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

Unified Diff: chrome/browser/ui/browser_commands.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
Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 43dd39ed7830b9ee9eaef2eb68bf45bba7d05564..94f181c02605cfbb3d32f12a8dc2aaf25f8635e5 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -853,19 +853,27 @@ void ShowWebsiteSettings(Browser* browser,
web_contents, url, ssl);
}
-
void Print(Browser* browser) {
#if defined(ENABLE_PRINTING)
WebContents* contents = browser->tab_strip_model()->GetActiveWebContents();
+
#if defined(ENABLE_FULL_PRINTING)
printing::PrintViewManager* print_view_manager =
printing::PrintViewManager::FromWebContents(contents);
- print_view_manager->PrintPreviewNow(false);
-#else
+ if (!browser->profile()->GetPrefs()->GetBoolean(
+ prefs::kPrintPreviewDisabled)) {
+ print_view_manager->PrintPreviewNow(false);
+ return;
+ }
+#else // ENABLE_FULL_PRINTING
printing::PrintViewManagerBasic* print_view_manager =
printing::PrintViewManagerBasic::FromWebContents(contents);
+#endif // ENABLE_FULL_PRINTING
+
+#if !defined(DISABLE_BASIC_PRINTING)
print_view_manager->PrintNow();
-#endif // defined(ENABLE_FULL_PRINTING)
+#endif // DISABLE_BASIC_PRINTING
+
#endif // defined(ENABLE_PRINTING)
}

Powered by Google App Engine
This is Rietveld 408576698