diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-31 19:54:54 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-31 19:54:54 +0000 |
commit | adefec58ada3ab8ffd373bb6cfc1e1b6adbad4eb (patch) | |
tree | 5d4594e415c8adc8448027ed42f43124d154d5d2 /content | |
parent | d2a892601a3524959b131e97f45b3bcc40811ab9 (diff) | |
download | chromium_src-adefec58ada3ab8ffd373bb6cfc1e1b6adbad4eb.zip chromium_src-adefec58ada3ab8ffd373bb6cfc1e1b6adbad4eb.tar.gz chromium_src-adefec58ada3ab8ffd373bb6cfc1e1b6adbad4eb.tar.bz2 |
Cleanup: Move more print code out of RVH.
BUG=76795
TEST=none
Review URL: http://codereview.chromium.org/6780020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/browser/renderer_host/render_view_host.cc | 14 | ||||
-rw-r--r-- | content/browser/renderer_host/render_view_host.h | 11 | ||||
-rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 4 | ||||
-rw-r--r-- | content/browser/tab_contents/tab_contents.h | 3 |
4 files changed, 1 insertions, 31 deletions
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc index f305870..9a5f4c28 100644 --- a/content/browser/renderer_host/render_view_host.cc +++ b/content/browser/renderer_host/render_view_host.cc @@ -24,8 +24,8 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/render_messages.h" #include "chrome/common/print_messages.h" +#include "chrome/common/render_messages.h" #include "chrome/common/safebrowsing_messages.h" #include "chrome/common/spellcheck_messages.h" #include "chrome/common/translate_errors.h" @@ -381,14 +381,6 @@ bool RenderViewHost::PrintPages() { return Send(new PrintMsg_PrintPages(routing_id())); } -bool RenderViewHost::PrintPreview(const DictionaryValue& settings) { - return Send(new PrintMsg_PrintPreview(routing_id(), settings)); -} - -void RenderViewHost::PrintingDone(int document_cookie, bool success) { - Send(new PrintMsg_PrintingDone(routing_id(), document_cookie, success)); -} - void RenderViewHost::StartFinding(int request_id, const string16& search_text, bool forward, @@ -1217,10 +1209,6 @@ void RenderViewHost::ContextMenuClosed( Send(new ViewMsg_ContextMenuClosed(routing_id(), custom_context)); } -void RenderViewHost::PrintForPrintPreview(const DictionaryValue& job_settings) { - Send(new PrintMsg_PrintForPrintPreview(routing_id(), job_settings)); -} - void RenderViewHost::OnMsgStartDragging( const WebDropData& drop_data, WebDragOperationsMask drag_operations_mask, diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h index ff2a4d6..c53db07 100644 --- a/content/browser/renderer_host/render_view_host.h +++ b/content/browser/renderer_host/render_view_host.h @@ -28,7 +28,6 @@ #include "webkit/glue/window_open_disposition.h" class ChildProcessSecurityPolicy; -class DictionaryValue; class FilePath; class GURL; class ListValue; @@ -216,12 +215,6 @@ class RenderViewHost : public RenderWidgetHost { // behalf. bool PrintPages(); - // Asks the renderer to render pages for print preview with |settings|. - bool PrintPreview(const DictionaryValue& settings); - - // Notify renderer of success/failure of print job. - void PrintingDone(int document_cookie, bool success); - // Start looking for a string within the content of the page, with the // specified options. void StartFinding(int request_id, @@ -318,10 +311,6 @@ class RenderViewHost : public RenderWidgetHost { void ContextMenuClosed( const webkit_glue::CustomContextMenuContext& custom_context); - // Triggers printing of the preview PDF. |job_settings| dictionary contains - // new print job settings information. - void PrintForPrintPreview(const DictionaryValue& job_settings); - // Copies the image at the specified point. void CopyImageAt(int x, int y); diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 26b6ea3..9869999 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -1158,10 +1158,6 @@ bool TabContents::PrintNow() { return render_view_host()->PrintPages(); } -void TabContents::PrintingDone(int document_cookie, bool success) { - render_view_host()->PrintingDone(document_cookie, success); -} - bool TabContents::IsActiveEntry(int32 page_id) { NavigationEntry* active_entry = controller_.GetActiveEntry(); return (active_entry != NULL && diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 60602f6..9ec2b39 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -560,9 +560,6 @@ class TabContents : public PageNavigator, // this function. Returns false if printing is impossible at the moment. bool PrintNow(); - // Notify the completion of a printing job. - void PrintingDone(int document_cookie, bool success); - // Returns true if the active NavigationEntry's page_id equals page_id. bool IsActiveEntry(int32 page_id); |