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

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: rebase Created 6 years 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 3f277c594182f0c9904fb903c3e1e70b1436946d..cd57882e4ca6febc0305498ff6d3401604caeb9c 100644
--- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc
@@ -24,6 +24,10 @@
#include "printing/printing_utils.h"
#include "ui/base/l10n/l10n_util.h"
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/tab_android.h"
+#endif
+
using content::BrowserThread;
namespace printing {
@@ -117,7 +121,7 @@ void PrintJobWorker::SetNewOwner(PrintJobWorkerOwner* new_owner) {
}
void PrintJobWorker::GetSettings(
- bool ask_user_for_settings,
+ PrinterQuery::GetSettingsAskParam ask_settings_type,
int document_page_count,
bool has_selection,
MarginType margin_type) {
@@ -134,7 +138,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 == PrinterQuery::GetSettingsAskParam::ASK_USER) {
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&HoldRefCallback, make_scoped_refptr(owner_),
@@ -142,6 +146,13 @@ void PrintJobWorker::GetSettings(
base::Unretained(this),
document_page_count,
has_selection)));
+ } else if (ask_settings_type ==
+ PrinterQuery::GetSettingsAskParam::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,
@@ -151,6 +162,26 @@ void PrintJobWorker::GetSettings(
}
}
+void PrintJobWorker::ShowSystemDialog() {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+#if defined(OS_ANDROID)
+ PrintingContextDelegate* pcd =
+ static_cast<PrintingContextDelegate*>(printing_context_delegate_.get());
+ content::WebContents* wc = pcd->GetWebContents();
Vitaly Buka (NO REVIEWS) 2014/12/12 08:37:16 please merge ShowSystemDialog and GetSettingsWithU
+ TabAndroid* tab = TabAndroid::FromWebContents(wc);
+ if (tab) {
+ // If fails or is not called, attempting to start a pending print does
+ // nothing and will notify that printing is finished.
+ tab->SetPendingPrint();
+ }
+#endif
+
+ 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