| Index: chrome/service/cloud_print/print_system_cups.cc
|
| diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc
|
| index cbaf2cd91ac87d3120fa757a9cccf7cce88d596a..689d7b5ffe33b0e388fcea545c2e5d9faca890c3 100644
|
| --- a/chrome/service/cloud_print/print_system_cups.cc
|
| +++ b/chrome/service/cloud_print/print_system_cups.cc
|
| @@ -127,6 +127,8 @@ class PrintSystemCUPS : public PrintSystem {
|
| }
|
|
|
| private:
|
| + virtual ~PrintSystemCUPS() {}
|
| +
|
| // Following functions are wrappers around corresponding CUPS functions.
|
| // <functions>2() are called when print server is specified, and plain
|
| // version in another case. There is an issue specifing CUPS_HTTP_DEFAULT
|
| @@ -173,9 +175,6 @@ class PrintServerWatcherCUPS
|
| : print_system_(print_system),
|
| delegate_(NULL) {
|
| }
|
| - ~PrintServerWatcherCUPS() {
|
| - StopWatching();
|
| - }
|
|
|
| // PrintSystem::PrintServerWatcher implementation.
|
| virtual bool StartWatching(
|
| @@ -210,6 +209,10 @@ class PrintServerWatcherCUPS
|
| }
|
|
|
| private:
|
| + virtual ~PrintServerWatcherCUPS() {
|
| + StopWatching();
|
| + }
|
| +
|
| std::string GetPrintersHash() {
|
| printing::PrinterList printer_list;
|
| print_system_->EnumeratePrinters(&printer_list);
|
| @@ -245,10 +248,6 @@ class PrinterWatcherCUPS
|
| print_system_(print_system) {
|
| }
|
|
|
| - ~PrinterWatcherCUPS() {
|
| - StopWatching();
|
| - }
|
| -
|
| // PrintSystem::PrinterWatcher implementation.
|
| virtual bool StartWatching(
|
| PrintSystem::PrinterWatcher::Delegate* delegate) OVERRIDE{
|
| @@ -321,6 +320,10 @@ class PrinterWatcherCUPS
|
| }
|
|
|
| private:
|
| + virtual ~PrinterWatcherCUPS() {
|
| + StopWatching();
|
| + }
|
| +
|
| std::string GetSettingsHash() {
|
| printing::PrinterBasicInfo info;
|
| if (!print_system_->GetPrinterInfo(printer_name_, &info))
|
| @@ -388,6 +391,8 @@ class JobSpoolerCUPS : public PrintSystem::JobSpooler {
|
| }
|
|
|
| private:
|
| + virtual ~JobSpoolerCUPS() {}
|
| +
|
| scoped_refptr<PrintSystemCUPS> print_system_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(JobSpoolerCUPS);
|
|
|