summaryrefslogtreecommitdiffstats
path: root/chrome/utility
diff options
context:
space:
mode:
authorvitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 08:54:57 +0000
committervitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 08:54:57 +0000
commit4f9dd83ebff74183730af6c0f1b4b8f67703b06e (patch)
tree7b1df04c06c6970d4efbeef20d6f877f27c454de /chrome/utility
parent4b6ebd93159d5b4f1ea9151ab59fefaf7db725cb (diff)
downloadchromium_src-4f9dd83ebff74183730af6c0f1b4b8f67703b06e.zip
chromium_src-4f9dd83ebff74183730af6c0f1b4b8f67703b06e.tar.gz
chromium_src-4f9dd83ebff74183730af6c0f1b4b8f67703b06e.tar.bz2
ScopedPrinterInfoSetter sets printer related information to be available for breakpad. This CL inserts ScopedPrinterInfoSetter in places where Cloud print accesses printers and crash is possible.
BUG=108194 TEST=none Review URL: http://codereview.chromium.org/9693064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/utility')
-rw-r--r--chrome/utility/chrome_content_utility_client.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index b360b61..4e8bb38 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/importer/external_process_importer_bridge.h"
#include "chrome/browser/importer/importer.h"
#include "chrome/browser/importer/profile_import_process_messages.h"
+#include "chrome/common/child_process_logging.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_utility_messages.h"
#include "chrome/common/extensions/extension.h"
@@ -372,6 +373,10 @@ void ChromeContentUtilityClient::OnGetPrinterCapsAndDefaults(
scoped_refptr<printing::PrintBackend> print_backend =
printing::PrintBackend::CreateInstance(NULL);
printing::PrinterCapsAndDefaults printer_info;
+
+ child_process_logging::ScopedPrinterInfoSetter prn_info(
+ print_backend->GetPrinterDriverInfo(printer_name));
+
if (print_backend->GetPrinterCapsAndDefaults(printer_name, &printer_info)) {
Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Succeeded(
printer_name, printer_info));