summaryrefslogtreecommitdiffstats
path: root/components/printing/common
diff options
context:
space:
mode:
authorkalman <kalman@chromium.org>2015-06-29 13:50:07 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-29 20:50:46 +0000
commit134274bdd83edf8265c6e8d87466009f37bd5704 (patch)
tree8b21e50ec808b7ed2de4dbddb63de80b36fa3587 /components/printing/common
parentf37df9aa5ff670d0a816ff6e66d19d04f87c284d (diff)
downloadchromium_src-134274bdd83edf8265c6e8d87466009f37bd5704.zip
chromium_src-134274bdd83edf8265c6e8d87466009f37bd5704.tar.gz
chromium_src-134274bdd83edf8265c6e8d87466009f37bd5704.tar.bz2
Revert of Disabled two IPC messages on ChromeOS (patchset #1 id:1 of https://codereview.chromium.org/1221523002/)
Reason for revert: Likely broke ChromiumOS build: ../../components/printing/test/print_web_view_helper_browsertest.cc: In member function 'void printing::PrintWebViewHelperTestBase::VerifyPagesPrinted(bool)': ../../components/printing/test/print_web_view_helper_browsertest.cc:198:14: error: 'PrintHostMsg_TempFileForPrintingWritten' has not been declared PrintHostMsg_TempFileForPrintingWritten::ID) != NULL); Original issue's description: > Disabled two IPC messages on ChromeOS > > PrintHostMsg_AllocateTempFileForPrinting and > PrintHostMsg_TempFileForPrintingWritten were used only > by Cloud Print Dialog. > > BUG=408684 > > Committed: https://crrev.com/3401f2836863aaee76e2115bc502820a149774c9 > Cr-Commit-Position: refs/heads/master@{#336614} TBR=inferno@chromium.org,jschuh@chromium.org,nasko@chromium.org,vitalybuka@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=408684 Review URL: https://codereview.chromium.org/1214183005 Cr-Commit-Position: refs/heads/master@{#336633}
Diffstat (limited to 'components/printing/common')
-rw-r--r--components/printing/common/print_messages.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/printing/common/print_messages.h b/components/printing/common/print_messages.h
index 058c237..bece6b6 100644
--- a/components/printing/common/print_messages.h
+++ b/components/printing/common/print_messages.h
@@ -397,7 +397,7 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PrintHostMsg_ScriptedPrint,
PrintMsg_PrintPages_Params
/* settings chosen by the user*/)
-#if defined(OS_ANDROID)
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
// Asks the browser to create a temporary file for the renderer to fill
// in resulting PdfMetafileSkia in printing.
IPC_SYNC_MESSAGE_CONTROL1_2(PrintHostMsg_AllocateTempFileForPrinting,