Revert "Move the code of getting printing settings to another class."
authorCheng Zhao <zcbenz@gmail.com>
Fri, 22 Aug 2014 07:03:39 +0000 (15:03 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 22 Aug 2014 07:03:39 +0000 (15:03 +0800)
commitd20ec6952a56404283f431286c6f6bec2ba7fd9f
treea5a9c7744b085de38cbed9a7d42e8ce9ac396909
parente43b3309af9b5e03a7a4189522937e907c1816c6
Revert "Move the code of getting printing settings to another class."

This reverts commit 57d06c52413b94fbd5517569efab0e058655c4bb.

Conflicts:
atom/browser/printing/printing_config_service.cc
atom.gyp
atom/browser/atom_browser_client.cc
atom/browser/printing/printing_config_service.cc [deleted file]
atom/browser/printing/printing_config_service.h [deleted file]
chromium_src/chrome/browser/printing/printing_message_filter.cc [moved from atom/browser/printing/printing_message_filter.cc with 50% similarity]
chromium_src/chrome/browser/printing/printing_message_filter.h [moved from atom/browser/printing/printing_message_filter.h with 74% similarity]