summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-15 04:41:15 +0000
committercraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-15 04:41:15 +0000
commit11f2b27387b18729f3926c6491dd426ab1a812ec (patch)
tree4975b3b41ed4341a95aba31f664aa72a38f6a25b
parentd7660f1c6bfa23327b20d6e1ae308c91140388ab (diff)
downloadchromium_src-11f2b27387b18729f3926c6491dd426ab1a812ec.zip
chromium_src-11f2b27387b18729f3926c6491dd426ab1a812ec.tar.gz
chromium_src-11f2b27387b18729f3926c6491dd426ab1a812ec.tar.bz2
Linux: fix shared build.
The demise of temp scaffolding has left the shared build in an unhappy state where the compiler complains about vtable issues with PrintJob because only half the class is implemented. Fix this by compiling some more printing files on linux and stubbing out AskUserForSettings. BUG=none TEST=linux shared build compiles. Other builds still ok too. Review URL: http://codereview.chromium.org/598066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39038 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/printing/print_job_linux.cc17
-rwxr-xr-xchrome/chrome_browser.gypi4
-rw-r--r--printing/printing_context_cairo.cc9
3 files changed, 9 insertions, 21 deletions
diff --git a/chrome/browser/printing/print_job_linux.cc b/chrome/browser/printing/print_job_linux.cc
deleted file mode 100644
index f8776a8..0000000
--- a/chrome/browser/printing/print_job_linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/printing/print_job.h"
-
-#include "base/logging.h"
-#include "chrome/browser/printing/print_job_worker.h"
-#include "printing/printed_document.h"
-
-namespace printing {
-
-PrintJob::PrintJob() : ui_message_loop_(NULL) {
- NOTIMPLEMENTED();
-}
-
-} // namespace printing
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a0ac454..c5f031d 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1467,7 +1467,6 @@
'browser/power_save_blocker_win.cc',
'browser/printing/print_dialog_gtk.cc',
'browser/printing/print_dialog_gtk.h',
- 'browser/printing/print_job_linux.cc',
'browser/printing/print_job.cc',
'browser/printing/print_job.h',
'browser/printing/print_job_manager_linux.cc',
@@ -2179,12 +2178,9 @@
],
'sources!': [
# Exclude most of printing, it's not ported yet.
- 'browser/printing/print_job.cc',
'browser/printing/print_job.h',
'browser/printing/print_job_manager.cc',
'browser/printing/print_job_manager.h',
- 'browser/printing/print_job_worker.cc',
- 'browser/printing/print_job_worker.h',
'browser/printing/print_job_worker_owner.h',
'browser/printing/print_view_manager.cc',
'browser/printing/print_view_manager.h',
diff --git a/printing/printing_context_cairo.cc b/printing/printing_context_cairo.cc
index fcc51f7..d0a571f 100644
--- a/printing/printing_context_cairo.cc
+++ b/printing/printing_context_cairo.cc
@@ -22,6 +22,15 @@ PrintingContext::~PrintingContext() {
ResetSettings();
}
+PrintingContext::Result PrintingContext::AskUserForSettings(
+ gfx::NativeWindow window,
+ int max_pages,
+ bool has_selection) {
+
+ NOTIMPLEMENTED();
+
+ return FAILED;
+}
PrintingContext::Result PrintingContext::UseDefaultSettings() {
DCHECK(!in_print_job_);