Merge 121891 - Disable Chrome's print preview in Chrome Frame.

chrome_frame/chrome_frame_automation.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/chrome_frame_automation.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 252 matching lines @@
 
     // Chrome Frame never wants Chrome to start up with a First Run UI.
     command_line->AppendSwitch(switches::kNoFirstRun);
 
     // Chrome Frame never wants to run background extensions since they
     // interfere with in-use updates.
     command_line->AppendSwitch(switches::kDisableBackgroundMode);
 
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
 
+#if defined(GOOGLE_CHROME_BUILD)
+    // Chrome Frame should use the native print dialog.
+    command_line->AppendSwitch(switches::kDisablePrintPreview);
+#endif
+
     // Disable the "Whoa! Chrome has crashed." dialog, because that isn't very
     // useful for Chrome Frame users.
 #ifndef NDEBUG
     command_line->AppendSwitch(switches::kNoErrorDialogs);
 #endif
 
     // In headless mode runs like reliability test runs we want full crash dumps
     // from chrome.
     if (IsHeadlessMode())
       command_line->AppendSwitch(switches::kFullMemoryCrashReport);
@@ skipping 983 matching lines @@
     const net::URLRequestStatus& status) {
   automation_server_->Send(new AutomationMsg_RequestEnd(
       tab_->handle(), request_id, status));
 }
 
 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success,
     const GURL& url, const std::string& cookie_string, int cookie_id) {
   automation_server_->Send(new AutomationMsg_GetCookiesHostResponse(
       tab_->handle(), success, url, cookie_string, cookie_id));
 }