diff options
| author | tbarzic <tbarzic@chromium.org> | 2015-02-06 10:31:44 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-06 18:32:12 +0000 |
| commit | 86b3295d6ac8d5f6f947861ac9c2d6fa51479781 (patch) | |
| tree | fe279ce5ae9299731f10a877dc187d909c8de727 /extensions/browser | |
| parent | 757cde2ca3f0c6d71ade31c98617c4f44d91aa9e (diff) | |
| download | chromium_src-86b3295d6ac8d5f6f947861ac9c2d6fa51479781.zip chromium_src-86b3295d6ac8d5f6f947861ac9c2d6fa51479781.tar.gz chromium_src-86b3295d6ac8d5f6f947861ac9c2d6fa51479781.tar.bz2 | |
Allow printerProvider API services in incognito
BUG=455999
TEST=Chrome does not crash when changing selected printer in print
preview opened in an incognito window
Review URL: https://codereview.chromium.org/903123002
Cr-Commit-Position: refs/heads/master@{#315074}
Diffstat (limited to 'extensions/browser')
| -rw-r--r-- | extensions/browser/api/printer_provider/printer_provider_api.h | 1 | ||||
| -rw-r--r-- | extensions/browser/api/printer_provider_internal/printer_provider_internal_api.h | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/extensions/browser/api/printer_provider/printer_provider_api.h b/extensions/browser/api/printer_provider/printer_provider_api.h index 04fde74..a6da0a9 100644 --- a/extensions/browser/api/printer_provider/printer_provider_api.h +++ b/extensions/browser/api/printer_provider/printer_provider_api.h @@ -209,6 +209,7 @@ class PrinterProviderAPI : public BrowserContextKeyedAPI, }; // BrowserContextKeyedAPI implementation. + static const bool kServiceRedirectedInIncognito = true; static const char* service_name() { return "PrinterProvider"; } // PrinterProviderInternalAPIObserver implementation: diff --git a/extensions/browser/api/printer_provider_internal/printer_provider_internal_api.h b/extensions/browser/api/printer_provider_internal/printer_provider_internal_api.h index ac34c50..703ffb5 100644 --- a/extensions/browser/api/printer_provider_internal/printer_provider_internal_api.h +++ b/extensions/browser/api/printer_provider_internal/printer_provider_internal_api.h @@ -46,6 +46,10 @@ class PrinterProviderInternalAPI : public BrowserContextKeyedAPI { friend class PrinterProviderInternalReportPrinterCapabilityFunction; friend class PrinterProviderInternalReportPrintResultFunction; + // BrowserContextKeyedAPI implementation. + static const bool kServiceRedirectedInIncognito = true; + static const char* service_name() { return "PrinterProviderInternal"; } + // Notifies observers that a printerProvider.onGetPrintersRequested callback // has been called. Called from // |PrinterProviderInternalReportPrintersFunction|. @@ -68,9 +72,6 @@ class PrinterProviderInternalAPI : public BrowserContextKeyedAPI { int request_id, core_api::printer_provider_internal::PrintError error); - // BrowserContextKeyedAPI implementation. - static const char* service_name() { return "PrinterProviderInternal"; } - ObserverList<PrinterProviderInternalAPIObserver> observers_; DISALLOW_COPY_AND_ASSIGN(PrinterProviderInternalAPI); |