Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2181)

Unified Diff: chrome/browser/printing/print_job_worker.cc

Issue 740983002: Implement window.print() on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: typos, sorry Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/printing/print_job_worker.cc
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
index ee8cddea181a9a759182b4d828a3d4a45ae424da..78950f84fab45a54e75afb62e710faca42b702f2 100644
--- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc
@@ -10,6 +10,11 @@
#include "base/compiler_specific.h"
#include "base/message_loop/message_loop.h"
#include "base/values.h"
+
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/tab_android.h"
+#endif
+
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/printing/print_job.h"
@@ -44,6 +49,8 @@ class PrintingContextDelegate : public PrintingContext::Delegate {
gfx::NativeView GetParentView() override;
std::string GetAppLocale() override;
+ void SetPendingPrint() override;
+
private:
int render_process_id_;
int render_view_id_;
@@ -72,6 +79,22 @@ std::string PrintingContextDelegate::GetAppLocale() {
return g_browser_process->GetApplicationLocale();
}
+void PrintingContextDelegate::SetPendingPrint() {
+ LOG(INFO) << "DGN PrintingContextDelegate::SetPendingPrint";
+#if defined(OS_ANDROID)
+ // Tab (Printable) needed to print. How to call it without the tab directly?
+ // Removing the dependency on chrome would make it easier to move it to
+ // printing_context_android
+ content::RenderViewHost* view = content::RenderViewHost::FromID(
+ render_process_id_, render_view_id_);
+ DCHECK(view);
+ content::WebContents* wc = content::WebContents::FromRenderViewHost(view);
+ TabAndroid* tab = TabAndroid::FromWebContents(wc);
+ if (tab) tab->SetPendingPrint();
+#endif
+}
+
+
void NotificationCallback(PrintJobWorkerOwner* print_job,
JobEventDetails::Type detail_type,
PrintedDocument* document,
@@ -112,7 +135,7 @@ void PrintJobWorker::SetNewOwner(PrintJobWorkerOwner* new_owner) {
}
void PrintJobWorker::GetSettings(
- bool ask_user_for_settings,
+ GetSettingsAskParam ask_settings_type,
int document_page_count,
bool has_selection,
MarginType margin_type) {
@@ -129,7 +152,7 @@ void PrintJobWorker::GetSettings(
// When we delegate to a destination, we don't ask the user for settings.
// TODO(mad): Ask the destination for settings.
- if (ask_user_for_settings) {
+ if (ask_settings_type == GetSettingsAskParam::ASK_USER) {
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&HoldRefCallback, make_scoped_refptr(owner_),
@@ -137,6 +160,13 @@ void PrintJobWorker::GetSettings(
base::Unretained(this),
document_page_count,
has_selection)));
+ } else if (ask_settings_type == GetSettingsAskParam::SYSTEM_SPECIFIC) {
+ LOG(INFO) << "DGN SYSTEM_SPECIFIC! ";
+ BrowserThread::PostTask(
+ BrowserThread::UI, FROM_HERE,
+ base::Bind(&HoldRefCallback, make_scoped_refptr(owner_),
+ base::Bind(&PrintJobWorker::ShowSystemDialog,
+ base::Unretained(this))));
} else {
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
@@ -146,6 +176,18 @@ void PrintJobWorker::GetSettings(
}
}
+void PrintJobWorker::ShowSystemDialog() {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ LOG(INFO) << "DGN ShowSystemDialog";
+
+ if (printing_context_ == NULL) LOG(INFO) << "DGN printing_context_ is NULL";
+
+ printing_context_delegate_->SetPendingPrint();
+ printing_context_->RequestSystemDialog(
+ base::Bind(&PrintJobWorker::GetSettingsDone,
+ base::Unretained(this)));
+}
+
void PrintJobWorker::SetSettings(
scoped_ptr<base::DictionaryValue> new_settings) {
DCHECK(task_runner_->RunsTasksOnCurrentThread());

Powered by Google App Engine
This is Rietveld 408576698