| Index: chrome/browser/ui/browser_commands.cc
|
| diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
|
| index 4befbb55369bb0e277bf27f0d834506c914958a6..dc32b0b708c81b27de488e2850b5e9267fe57e10 100644
|
| --- a/chrome/browser/ui/browser_commands.cc
|
| +++ b/chrome/browser/ui/browser_commands.cc
|
| @@ -252,7 +252,7 @@ bool IsShowingWebContentsModalDialog(Browser* browser) {
|
| return manager && manager->IsDialogActive();
|
| }
|
|
|
| -#if defined(ENABLE_BASIC_PRINTING)
|
| +#if defined(ENABLE_BASIC_PRINT_DIALOG)
|
| bool PrintPreviewShowing(const Browser* browser) {
|
| #if defined(ENABLE_PRINT_PREVIEW)
|
| WebContents* contents = browser->tab_strip_model()->GetActiveWebContents();
|
| @@ -264,7 +264,7 @@ bool PrintPreviewShowing(const Browser* browser) {
|
| return false;
|
| #endif
|
| }
|
| -#endif // ENABLE_BASIC_PRINTING
|
| +#endif // defined(ENABLE_BASIC_PRINT_DIALOG)
|
|
|
| } // namespace
|
|
|
| @@ -901,12 +901,16 @@ void BasicPrint(Browser* browser) {
|
| }
|
|
|
| bool CanBasicPrint(Browser* browser) {
|
| +#if defined(ENABLE_BASIC_PRINT_DIALOG)
|
| // If printing is not disabled via pref or policy, it is always possible to
|
| // advanced print when the print preview is visible.
|
| return browser->profile()->GetPrefs()->GetBoolean(prefs::kPrintingEnabled) &&
|
| - (PrintPreviewShowing(browser) || CanPrint(browser));
|
| + (PrintPreviewShowing(browser) || CanPrint(browser));
|
| +#else
|
| + return false; // The print dialog is disabled.
|
| +#endif // defined(ENABLE_BASIC_PRINT_DIALOG)
|
| }
|
| -#endif // ENABLE_BASIC_PRINTING
|
| +#endif // defined(ENABLE_BASIC_PRINTING)
|
|
|
| bool CanRouteMedia(Browser* browser) {
|
| // Do not allow user to open Media Router dialog when there is already an
|
|
|