mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Revert "Move the code of getting printing settings to another class."

Browse source 
This reverts commit 57d06c5241.

Conflicts:
	atom/browser/printing/printing_config_service.cc
This commit is contained in:
Cheng Zhao 2014-08-22 15:03:39 +08:00
parent e43b3309af
commit d20ec6952a
6 changed files with 134 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/atom_browser_client.cc
View file

@ -9,8 +9,8 @@
#include "atom/browser/atom_browser_main_parts.h"
#include "atom/browser/atom_resource_dispatcher_host_delegate.h"
#include "atom/browser/native_window.h"
#include "atom/browser/printing/printing_message_filter.h"
#include "atom/browser/window_list.h"
#include "chrome/browser/printing/printing_message_filter.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/resource_dispatcher_host.h"