• Home
  • History
  • Annotate
  • only in /external/chromium_org/printing/
History log of /external/chromium_org/printing/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
78901d17b47ef1f8d6d0a89eaf37f9523ba1de85 08-Dec-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: I6695b44b7c48580907460fb1a183c166e6ab505f
rinting.target.darwin-mips64.mk
rinting.target.linux-mips64.mk
rinting_jni_headers.target.darwin-mips64.mk
rinting_jni_headers.target.linux-mips64.mk
ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 29-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.44

This commit was generated by merge_to_master.py.

Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
UILD.gn
ackend/cups_helper.cc
ackend/print_backend_cups.cc
ackend/print_backend_win.cc
ackend/win_helper.cc
ackend/win_helper.h
mf_win.cc
mf_win.h
mf_win_unittest.cc
mage.cc
mage_win.cc
etafile.cc
etafile.h
etafile_impl.h
etafile_skia_wrapper.cc
etafile_skia_wrapper.h
df_metafile_cg_mac.cc
df_metafile_cg_mac.h
df_metafile_skia.cc
df_metafile_skia.h
rint_destination_interface.h
rint_destination_none.cc
rint_dialog_gtk_interface.h
rint_job_constants.cc
rint_job_constants.h
rinted_document.cc
rinted_document.h
rinted_document_linux.cc
rinted_document_mac.cc
rinted_document_win.cc
rinted_page.cc
rinted_page.h
rinted_page_unittest.cc
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_context.cc
rinting_context.h
rinting_context_android.cc
rinting_context_android.h
rinting_context_linux.cc
rinting_context_linux.h
rinting_context_mac.h
rinting_context_mac.mm
rinting_context_no_system_dialog.cc
rinting_context_no_system_dialog.h
rinting_context_system_dialog_win.cc
rinting_context_system_dialog_win.h
rinting_context_win.cc
rinting_context_win.h
rinting_context_win_unittest.cc
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-arm64.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
UILD.gn
rinting_context.cc
rinting_context_win.cc
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
rinted_document.cc
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-arm64.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
UILD.gn
ackend/win_helper.cc
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-arm64.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
nits.h
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
UILD.gn
ackend/print_backend_win.cc
ackend/win_helper.cc
mf_win.cc
mf_win_unittest.cc
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-arm64.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
ackend/cups_helper.cc
ackend/cups_helper_unittest.cc
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_context_mac.h
rinting_context_mac.mm
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-arm64.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
UILD.gn
ackend/cups_helper.cc
ackend/cups_helper_unittest.cc
ackend/print_backend.cc
ackend/print_backend.h
ackend/print_backend_cups.cc
ackend/print_backend_win.cc
age_size_margins.cc
age_size_margins.h
rint_job_constants.cc
rint_job_constants.h
rint_settings.cc
rint_settings.h
rint_settings_conversion.cc
rint_settings_conversion.h
rint_settings_initializer.cc
rint_settings_initializer.h
rinted_document.cc
rinted_document.h
rinted_page.cc
rinted_page.h
rinted_page_unittest.cc
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_context.cc
rinting_context.h
rinting_context_win.cc
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-arm64.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
UILD.gn
ackend/cups_helper.cc
ackend/cups_helper_unittest.cc
ackend/print_backend.cc
ackend/print_backend.h
ups_config_helper.py
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_context_win.cc
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-arm64.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
ackend/cups_helper.cc
ackend/print_backend_cups.cc
etafile_impl.h
rint_job_constants.cc
rint_job_constants.h
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_context.cc
rinting_context.h
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-arm64.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
0de6073388f4e2780db8536178b129cd8f6ab386 15-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-arm64.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ndroid/java/src/org/chromium/printing/PrintingContext.java
ackend/cups_helper.cc
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-arm64.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
rinting.target.darwin-arm.mk
rinting.target.darwin-arm64.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-arm64.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_jni_headers.target.darwin-arm64.mk
rinting_jni_headers.target.linux-arm64.mk
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
rint_destination_win.cc
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_context_win.cc
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
rint_settings_initializer_gtk.cc
rint_settings_initializer_gtk.h
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_context_win.cc
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ups_config_helper.py
rint_job_constants.cc
rint_job_constants.h
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.darwin-x86_64.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting.target.linux-x86_64.mk
rinting_context.cc
rinting_context_win.cc
rinting_context_win.h
rinting_context_win_unittest.cc
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.darwin-x86_64.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_jni_headers.target.linux-x86_64.mk
wg_raster_settings.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ndroid/java/src/org/chromium/printing/PrintManagerDelegateImpl.java
ndroid/java/src/org/chromium/printing/PrintingController.java
ndroid/java/src/org/chromium/printing/PrintingControllerImpl.java
ackend/cups_helper.cc
ackend/print_backend_consts.cc
ackend/print_backend_consts.h
ackend/print_backend_win.cc
ackend/printing_info_win.cc
ackend/printing_info_win.h
ackend/win_helper.cc
ackend/win_helper.h
mage.cc
df_metafile_skia.cc
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting_context_win.cc
rinting_context_win_unittest.cc
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
EPS
ackend/print_backend.cc
ackend/print_backend.h
ackend/print_backend_dummy.cc
ackend/print_backend_win.cc
ackend/win_helper.cc
ackend/win_helper.h
mage.cc
df_metafile_skia.cc
rint_destination_win.cc
rint_dialog_gtk_interface.h
rint_job_constants.h
rinted_document.cc
rinted_document_gtk.cc
rinted_document_linux.cc
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting_context_android.cc
rinting_context_gtk.cc
rinting_context_gtk.h
rinting_context_linux.cc
rinting_context_linux.h
rinting_context_mac.mm
rinting_context_win.cc
rinting_context_win.h
rinting_context_win_unittest.cc
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
rinting_utils_unittest.cc
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
ndroid/java/src/org/chromium/printing/PrintDocumentAdapterWrapper.java
ndroid/java/src/org/chromium/printing/PrintingContext.java
ndroid/java/src/org/chromium/printing/PrintingController.java
ndroid/java/src/org/chromium/printing/PrintingControllerImpl.java
ackend/cups_helper.cc
mf_win_unittest.cc
df_metafile_skia.cc
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting_jni_headers.target.darwin-arm.mk
rinting_jni_headers.target.darwin-mips.mk
rinting_jni_headers.target.darwin-x86.mk
rinting_jni_headers.target.linux-arm.mk
rinting_jni_headers.target.linux-mips.mk
rinting_jni_headers.target.linux-x86.mk
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
EPS
WNERS
ndroid/OWNERS
ndroid/java/src/org/chromium/printing/PrintManagerDelegate.java
ndroid/java/src/org/chromium/printing/PrintManagerDelegateImpl.java
ndroid/java/src/org/chromium/printing/Printable.java
ndroid/java/src/org/chromium/printing/PrintingContext.java
ndroid/java/src/org/chromium/printing/PrintingContextInterface.java
ndroid/java/src/org/chromium/printing/PrintingController.java
ndroid/java/src/org/chromium/printing/PrintingControllerImpl.java
ackend/print_backend.cc
ackend/print_backend.h
ackend/print_backend_unittest.cc
ackend/win_helper.h
df_render_settings.h
rint_job_constants.cc
rint_job_constants.h
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting_context.cc
rinting_context_android.cc
rinting_context_mac.mm
rinting_context_win.cc
rinting_utils.cc
rinting_utils.h
rinting_utils_unittest.cc
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
rint_dialog_gtk_interface.h
rint_settings.cc
rint_settings.h
rint_settings_initializer_gtk.cc
rint_settings_initializer_mac.cc
rint_settings_initializer_win.cc
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting_context.cc
rinting_context.h
rinting_context_android.h
rinting_context_gtk.cc
rinting_context_gtk.h
rinting_context_mac.h
rinting_context_mac.mm
rinting_context_no_system_dialog.cc
rinting_context_no_system_dialog.h
rinting_context_win.cc
rinting_context_win.h
rinting_context_win_unittest.cc
nits.h
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
EPS
age_number.cc
rint_dialog_gtk_interface.h
rint_job_constants.cc
rint_job_constants.h
rint_settings.cc
rint_settings.h
rint_settings_initializer.cc
rint_settings_initializer.h
rint_settings_initializer_gtk.cc
rint_settings_initializer_gtk.h
rint_settings_initializer_mac.cc
rint_settings_initializer_mac.h
rint_settings_initializer_win.cc
rint_settings_initializer_win.h
rinted_document.cc
rinting.gyp
rinting_context.cc
rinting_context.h
rinting_context_android.h
rinting_context_gtk.cc
rinting_context_gtk.h
rinting_context_mac.h
rinting_context_mac.mm
rinting_context_no_system_dialog.cc
rinting_context_no_system_dialog.h
rinting_context_win.cc
rinting_context_win.h
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
ackend/cups_helper.cc
ackend/print_backend.h
age_setup_unittest.cc
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
WNERS
ackend/cups_helper.cc
ackend/cups_helper.h
ackend/cups_helper_unittest.cc
ackend/print_backend.cc
ackend/print_backend.h
ackend/print_backend_cups.cc
ackend/win_helper.cc
ackend/win_helper.h
age_range.cc
age_range_unittest.cc
rint_dialog_gtk_interface.h
rint_job_constants.h
rint_settings.cc
rint_settings.h
rint_settings_initializer.cc
rint_settings_initializer_gtk.cc
rinted_document.cc
rinted_document.h
rinted_pages_source.h
rinting.gyp
rinting_context.h
rinting_context_android.h
rinting_context_gtk.cc
rinting_context_gtk.h
rinting_context_mac.h
rinting_context_mac.mm
rinting_context_no_system_dialog.cc
rinting_context_no_system_dialog.h
rinting_context_win.cc
rinting_context_win.h
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
ackend/print_backend.cc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
EPS
ackend/cups_helper.cc
ackend/print_backend.cc
ackend/print_backend_cups.cc
mf_win_unittest.cc
mage.cc
rint_settings_initializer.cc
rinted_document.cc
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
un_all_unittests.cc
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
mf_win.cc
mf_win.h
etafile.h
df_metafile_cg_mac.cc
df_metafile_cg_mac.h
df_metafile_skia.cc
df_metafile_skia.h
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
mage_android.cc
mage_linux.cc
etafile.h
df_metafile_skia.cc
df_metafile_skia.h
rint_settings_initializer.cc
rinted_document.cc
rinting.gyp
rinting_context_android.h
c2db58bd994c04d98e4ee2cd7565b71548655fe3 14-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be
rinting.gyp
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
ackend/print_backend_cups.cc
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
EPS
ackend/print_backend.cc
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
rinted_document.cc
rinting_context_win.cc
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
ackend/cups_helper.cc
ackend/print_backend_cups.cc
rint_settings_initializer.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
ackend/cups_helper.cc
ackend/print_backend_cups.cc
mage_mac.cc
age_size_margins.cc
df_metafile_cg_mac.cc
df_metafile_cg_mac.h
rint_settings_initializer.cc
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-mips.mk
rinting.target.darwin-x86.mk
rinting.target.linux-arm.mk
rinting.target.linux-mips.mk
rinting.target.linux-x86.mk
rinting_context_mac.h
rinting_context_mac.mm
rinting_context_no_system_dialog.cc
rinting_context_win.cc
3c54152607de4272b3da0c146b71dcba8a0e5610 28-Jun-2013 Ben Murdoch <benm@google.com> Fixup MIPS makefiles

Change-Id: I9aa2b7e1c2db822880a3f48e308f62979577acd5
rinting.target.darwin-mips.mk
rinting.target.linux-mips.mk
e31802ad5b5d9fdf7daba665b671e9ecee368cb8 27-Jun-2013 Ben Murdoch <benm@google.com> Fix MIPS makefiles

Change-Id: I7a0daf1617a3908dd628c2fd4f501cbec1483bd9
rinting.target.darwin-mips.mk
rinting.target.linux-mips.mk
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
ackend/cups_helper.cc
ackend/print_backend.h
ackend/print_backend_cups.cc
ackend/print_backend_win.cc
ackend/win_helper.h
mage.cc
df_metafile_skia.cc
rint_dialog_gtk_interface.h
rint_settings.h
rint_settings_initializer.cc
rint_settings_initializer_gtk.cc
rinted_document.cc
rinted_document.h
rinted_pages_source.h
rinting_context.h
rinting_context_win.cc
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
rinting.target.darwin-mips.mk
rinting.target.linux-mips.mk
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
ackend/print_backend_unittest.cc
ackend/print_backend_win.cc
ackend/win_helper.cc
rint_settings_initializer.cc
rint_settings_initializer_gtk.cc
rinted_document.cc
rinting.gyp
rinting_context_win.cc
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
EPS
df_metafile_skia.cc
rinting.gyp
rinting_context_win.cc
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
ackend/print_backend_win.cc
ackend/printing_info_win.cc
ackend/printing_info_win.h
mf_win.cc
df_metafile_cg_mac.cc
rint_settings_initializer_mac.cc
rinted_document.cc
rinted_document.h
rinting.gyp
rinting.target.darwin-arm.mk
rinting.target.darwin-x86.mk
rinting.target.linux-arm.mk
rinting.target.linux-x86.mk
rinting_context_mac.mm
rinting_context_win.cc
rinting_context_win_unittest.cc
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
EPS
WNERS
ackend/cups_helper.cc
ackend/cups_helper_unittest.cc
ackend/print_backend.cc
ackend/print_backend.h
ackend/print_backend_cups.cc
ackend/print_backend_win.cc
ackend/printing_info_win.cc
ackend/printing_info_win.h
ackend/win_helper.cc
mf_win.cc
mf_win.h
mf_win_unittest.cc
mage.cc
mage.h
mage_win.cc
etafile.h
etafile_impl.h
etafile_skia_wrapper.cc
df_metafile_cg_mac.cc
df_metafile_cg_mac.h
df_metafile_skia.cc
df_metafile_skia.h
rint_destination_win.cc
rint_job_constants.cc
rint_job_constants.h
rint_settings.cc
rint_settings.h
rint_settings_initializer.cc
rinted_document.cc
rinted_document.h
rinting.gyp
rinting.target.linux-arm.mk
rinting.target.linux-x86.mk
rinting.target.mk
rinting_context.cc
rinting_context_win.cc
rinting_context_win.h
rinting_context_win_unittest.cc
nits.cc
nits.h
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
EPS
WNERS
ackend/cups_helper.cc
ackend/cups_helper.h
ackend/cups_helper_unittest.cc
ackend/print_backend.cc
ackend/print_backend.h
ackend/print_backend_chromeos.cc
ackend/print_backend_consts.cc
ackend/print_backend_consts.h
ackend/print_backend_cups.cc
ackend/print_backend_dummy.cc
ackend/print_backend_unittest.cc
ackend/print_backend_win.cc
ackend/win_helper.cc
ackend/win_helper.h
ups_config_helper.py
mf_win.cc
mf_win.h
mf_win_unittest.cc
mage.cc
mage.h
mage_linux.cc
mage_mac.cc
mage_win.cc
etafile.h
etafile_impl.h
etafile_skia_wrapper.cc
etafile_skia_wrapper.h
age_number.cc
age_number.h
age_number_unittest.cc
age_range.cc
age_range.h
age_range_unittest.cc
age_setup.cc
age_setup.h
age_setup_unittest.cc
age_size_margins.cc
age_size_margins.h
df_metafile_cg_mac.cc
df_metafile_cg_mac.h
df_metafile_cg_mac_unittest.cc
df_metafile_skia.cc
df_metafile_skia.h
df_render_settings.h
rint_destination_interface.h
rint_destination_none.cc
rint_destination_win.cc
rint_dialog_gtk_interface.h
rint_job_constants.cc
rint_job_constants.h
rint_settings.cc
rint_settings.h
rint_settings_initializer.cc
rint_settings_initializer.h
rint_settings_initializer_gtk.cc
rint_settings_initializer_gtk.h
rint_settings_initializer_mac.cc
rint_settings_initializer_mac.h
rint_settings_initializer_win.cc
rint_settings_initializer_win.h
rinted_document.cc
rinted_document.h
rinted_document_gtk.cc
rinted_document_mac.cc
rinted_document_win.cc
rinted_page.cc
rinted_page.h
rinted_page_unittest.cc
rinted_pages_source.h
rinting.gyp
rinting.target.mk
rinting_context.cc
rinting_context.h
rinting_context_gtk.cc
rinting_context_gtk.h
rinting_context_mac.h
rinting_context_mac.mm
rinting_context_no_system_dialog.cc
rinting_context_no_system_dialog.h
rinting_context_win.cc
rinting_context_win.h
rinting_context_win_unittest.cc
rinting_export.h
rinting_test.h
un_all_unittests.cc
est/data/test4.emf
nits.cc
nits.h
nits_unittest.cc