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

Setup PrintingMessageFilter for printing.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-21 21:19:43 +08:00
parent 11b9a06639
commit eb3ecab6a8
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/atom_browser_client.cc
View file

@ -10,6 +10,7 @@
#include "atom/browser/atom_resource_dispatcher_host_delegate.h" #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
#include "atom/browser/native_window.h" #include "atom/browser/native_window.h"
#include "atom/browser/window_list.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_process_host.h"
#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host.h"
#include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/resource_dispatcher_host.h"
@ -48,6 +49,11 @@ AtomBrowserClient::AtomBrowserClient()
AtomBrowserClient::~AtomBrowserClient() { AtomBrowserClient::~AtomBrowserClient() {
} }
void AtomBrowserClient::RenderProcessWillLaunch(
content::RenderProcessHost* host) {
host->AddFilter(new PrintingMessageFilter(host->GetID()));
}
void AtomBrowserClient::ResourceDispatcherHostCreated() { void AtomBrowserClient::ResourceDispatcherHostCreated() {
resource_dispatcher_delegate_.reset(new AtomResourceDispatcherHostDelegate); resource_dispatcher_delegate_.reset(new AtomResourceDispatcherHostDelegate);
content::ResourceDispatcherHost::Get()->SetDelegate( content::ResourceDispatcherHost::Get()->SetDelegate(

2
atom/browser/atom_browser_client.h
View file

@ -20,6 +20,8 @@ class AtomBrowserClient : public brightray::BrowserClient {
protected: protected:
// content::ContentBrowserClient: // content::ContentBrowserClient:
virtual void RenderProcessWillLaunch(
content::RenderProcessHost* host) OVERRIDE;
virtual void ResourceDispatcherHostCreated() OVERRIDE; virtual void ResourceDispatcherHostCreated() OVERRIDE;
virtual content::AccessTokenStore* CreateAccessTokenStore() OVERRIDE; virtual content::AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host, virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,

5
chromium_src/chrome/browser/printing/printing_message_filter.cc
View file

@ -87,11 +87,8 @@ void RenderParamsFromPrintSettings(const printing::PrintSettings& settings,
} // namespace } // namespace
PrintingMessageFilter::PrintingMessageFilter(int render_process_id, PrintingMessageFilter::PrintingMessageFilter(int render_process_id)
Profile* profile)
: BrowserMessageFilter(PrintMsgStart), : BrowserMessageFilter(PrintMsgStart),
// profile_io_data_(ProfileIOData::FromResourceContext(
// profile->GetResourceContext())),
render_process_id_(render_process_id), render_process_id_(render_process_id),
queue_(g_browser_process->print_job_manager()->queue()) { queue_(g_browser_process->print_job_manager()->queue()) {
DCHECK(queue_); DCHECK(queue_);

4
chromium_src/chrome/browser/printing/printing_message_filter.h
View file

@ -15,8 +15,6 @@
#endif #endif
struct PrintHostMsg_ScriptedPrint_Params; struct PrintHostMsg_ScriptedPrint_Params;
class Profile;
class ProfileIOData;
namespace base { namespace base {
class DictionaryValue; class DictionaryValue;
@ -37,7 +35,7 @@ class PrintQueriesQueue;
// renderer process on the IPC thread. // renderer process on the IPC thread.
class PrintingMessageFilter : public content::BrowserMessageFilter { class PrintingMessageFilter : public content::BrowserMessageFilter {
public: public:
PrintingMessageFilter(int render_process_id, Profile* profile); explicit PrintingMessageFilter(int render_process_id);
// content::BrowserMessageFilter methods. // content::BrowserMessageFilter methods.
virtual void OverrideThreadForMessage( virtual void OverrideThreadForMessage(