Chromium Code Reviews| 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..c2a2372b96b4641177952b8656a5ed8815fee31a 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 BUILDFLAG(ENABLE_BASIC_PRINT_DIALOG) |
|
Lei Zhang
2016/10/04 22:10:54
include chrome/common/features.h
skau
2016/10/05 00:18:00
Done.
|
| 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 // BUILDFLAG(ENABLE_BASIC_PRINT_DIALOG) |
| } // namespace |
| @@ -901,12 +901,16 @@ void BasicPrint(Browser* browser) { |
| } |
| bool CanBasicPrint(Browser* browser) { |
| +#if BUILDFLAG(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 // BUILDFLAG(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 |