diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 05:17:59 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 05:17:59 +0000 |
| commit | 64b33439c07976b4e655bb1cf43fe0a41dd1bb9b (patch) | |
| tree | 18da9066990823b67086f049215903978c99b350 /chrome/browser | |
| parent | 25b87f911dba1303c035df67a284729e012f82e4 (diff) | |
| download | chromium_src-64b33439c07976b4e655bb1cf43fe0a41dd1bb9b.zip chromium_src-64b33439c07976b4e655bb1cf43fe0a41dd1bb9b.tar.gz chromium_src-64b33439c07976b4e655bb1cf43fe0a41dd1bb9b.tar.bz2 | |
Print Preview - Disable print preview on Mac.
BUG=84499
TEST=none
Review URL: http://codereview.chromium.org/7080040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/about_flags.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/print_preview_ui_uitest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/print_preview_ui_unittest.cc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 179ebe8..adc01e6 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -168,9 +168,10 @@ const Experiment kExperiments[] = { kOsAll, SINGLE_VALUE_TYPE(switches::kDisableGpuVsync) }, -#if !defined(GOOGLE_CHROME_BUILD) +#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_MACOSX) // Only expose this for Chromium builds where users may not have the PDF - // plugin. Do not give Google Chrome users the option to disable it here. + // plugin. Do not give Google Chrome users the option to disable it here, + // except on Mac, where it is disabled. { "print-preview", // FLAGS:RECORD_UMA IDS_FLAGS_PRINT_PREVIEW_NAME, diff --git a/chrome/browser/ui/webui/print_preview_ui_uitest.cc b/chrome/browser/ui/webui/print_preview_ui_uitest.cc index b24497e..83b6541 100644 --- a/chrome/browser/ui/webui/print_preview_ui_uitest.cc +++ b/chrome/browser/ui/webui/print_preview_ui_uitest.cc @@ -19,7 +19,7 @@ class PrintPreviewUITest : public UITest { public: PrintPreviewUITest() { dom_automation_enabled_ = true; -#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) +#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) || defined(OS_MACOSX) launch_arguments_.AppendSwitch(switches::kEnablePrintPreview); #endif } diff --git a/chrome/browser/ui/webui/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview_ui_unittest.cc index 65613d3..184af49 100644 --- a/chrome/browser/ui/webui/print_preview_ui_unittest.cc +++ b/chrome/browser/ui/webui/print_preview_ui_unittest.cc @@ -23,7 +23,7 @@ typedef BrowserWithTestWindowTest PrintPreviewUITest; // Create/Get a preview tab for initiator tab. TEST_F(PrintPreviewUITest, PrintPreviewData) { -#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) +#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) || defined(OS_MACOSX) CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePrintPreview); #endif ASSERT_TRUE(browser()); |