diff options
| author | fgorski@chromium.org <fgorski@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 22:46:18 +0000 |
|---|---|---|
| committer | fgorski@chromium.org <fgorski@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 22:46:18 +0000 |
| commit | 31c6bcaae4be79ad1a893b9530a926cb119fcace (patch) | |
| tree | 0f4a316476031e8fda5275fbc96162c8b6cf0e93 /chrome/browser/printing | |
| parent | bd0cc65fb0b8190abcb272ef0918fad48297a1be (diff) | |
| download | chromium_src-31c6bcaae4be79ad1a893b9530a926cb119fcace.zip chromium_src-31c6bcaae4be79ad1a893b9530a926cb119fcace.tar.gz chromium_src-31c6bcaae4be79ad1a893b9530a926cb119fcace.tar.bz2 | |
Revert 272587 "Remove kEnablePrintPreview now that the pdf plugi..."
Reverting bacuse of failure of ClosingWindowWhilePrintingShouldNotCrash
after it was enabled by this change on Linux Tests.
> Remove kEnablePrintPreview now that the pdf plugin is part of Chromium.
>
> R=thestig@chromium.org
>
> Review URL: https://codereview.chromium.org/296453015
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/299273003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
| -rw-r--r-- | chrome/browser/printing/print_preview_dialog_controller_browsertest.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc index 65f03ca..c18b999 100644 --- a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc +++ b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc @@ -2,12 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/print_messages.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" @@ -121,6 +123,12 @@ class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest { } private: + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { +#if !defined(GOOGLE_CHROME_BUILD) + command_line->AppendSwitch(switches::kEnablePrintPreview); +#endif + } + virtual void SetUpOnMainThread() OVERRIDE { WebContents* first_tab = browser()->tab_strip_model()->GetActiveWebContents(); |