From c551f43206405019121bd2b2c93714319a0a3300 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 23 Jan 2020 17:21:03 +0100 Subject: BASELINE: Update Chromium to 79.0.3945.139 Change-Id: I336b7182fab9bca80b709682489c07db112eaca5 Reviewed-by: Allan Sandfeld Jensen --- .../settings/chromeos/cups_printers_handler.cc | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'chromium/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc') diff --git a/chromium/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc b/chromium/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc index 2f4c1749e9a..ce238a44a78 100644 --- a/chromium/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc +++ b/chromium/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc @@ -36,7 +36,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" #include "chromeos/dbus/dbus_thread_manager.h" -#include "chromeos/dbus/debug_daemon_client.h" +#include "chromeos/dbus/debug_daemon/debug_daemon_client.h" #include "chromeos/printing/ppd_cache.h" #include "chromeos/printing/ppd_line_reader.h" #include "chromeos/printing/ppd_provider.h" @@ -75,8 +75,15 @@ void OnRemovedPrinter(const Printer::PrinterProtocol& protocol, bool success) { } // Log if the IPP attributes request was succesful. -void RecordIppQuerySuccess(bool success) { - UMA_HISTOGRAM_BOOLEAN("Printing.CUPS.IppAttributesSuccess", success); +void RecordIppQueryResult(const PrinterQueryResult& result) { + bool reachable = (result != PrinterQueryResult::UNREACHABLE); + UMA_HISTOGRAM_BOOLEAN("Printing.CUPS.IppDeviceReachable", reachable); + + if (reachable) { + // Only record whether the query was successful if we reach the printer. + bool query_success = (result == PrinterQueryResult::SUCCESS); + UMA_HISTOGRAM_BOOLEAN("Printing.CUPS.IppAttributesSuccess", query_success); + } } // Returns true if |printer_uri| is an IPP uri. @@ -116,7 +123,7 @@ base::Value BuildCupsPrintersList(const std::vector& printers) { for (const Printer& printer : printers) { // Some of these printers could be invalid but we want to allow the user // to edit them. crbug.com/778383 - printers_list.GetList().push_back( + printers_list.Append( base::Value::FromUniquePtrValue(GetCupsPrinterInfo(printer))); } @@ -491,9 +498,9 @@ void CupsPrintersHandler::OnAutoconfQueriedDiscovered( const std::string& make_and_model, const std::vector& document_formats, bool ipp_everywhere) { - const bool success = result == PrinterQueryResult::SUCCESS; - RecordIppQuerySuccess(success); + RecordIppQueryResult(result); + const bool success = result == PrinterQueryResult::SUCCESS; if (success) { // If we queried a valid make and model, use it. The mDNS record isn't // guaranteed to have it. However, don't overwrite it if the printer @@ -537,8 +544,8 @@ void CupsPrintersHandler::OnAutoconfQueried( const std::string& make_and_model, const std::vector& document_formats, bool ipp_everywhere) { + RecordIppQueryResult(result); const bool success = result == PrinterQueryResult::SUCCESS; - RecordIppQuerySuccess(success); if (result == PrinterQueryResult::UNREACHABLE) { PRINTER_LOG(DEBUG) << "Could not reach printer"; @@ -966,6 +973,7 @@ void CupsPrintersHandler::VerifyPpdContents(const base::FilePath& path, void CupsPrintersHandler::HandleStartDiscovery(const base::ListValue* args) { PRINTER_LOG(DEBUG) << "Start printer discovery"; + AllowJavascript(); discovery_active_ = true; OnPrintersChanged(PrinterClass::kAutomatic, printers_manager_->GetPrinters(PrinterClass::kAutomatic)); -- cgit v1.2.3