chrome/browser/ui/webui/print_preview/print_preview_handler.h - Issue 321703002: Revert of Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_handler.h

Issue 321703002: Revert of Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/print_preview/native_layer.js ('k') | chrome/browser/ui/webui/print_preview/print_preview_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/print_preview/print_preview_handler.h

diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.h b/chrome/browser/ui/webui/print_preview/print_preview_handler.h

index 2a263fa2211ea5e30a750b58d3b2775480c33c0a..70464a8592ad3ff168a80300c592822523f34bb5 100644

--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.h

+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.h

@@ -99,6 +99,7 @@

private:

class AccessTokenService;

+ struct CUPSPrinterColorModels;

static bool PrivetPrintingEnabled();

@@ -295,6 +296,11 @@

// Holds token service to get OAuth2 access tokens.

scoped_ptr<AccessTokenService> token_service_;

+#if defined(USE_CUPS)

+ // The color capabilities from the last printer queried.

+ scoped_ptr<CUPSPrinterColorModels> cups_printer_color_models_;

+#endif

#if defined(ENABLE_SERVICE_DISCOVERY)

scoped_refptr<local_discovery::ServiceDiscoverySharedClient>

service_discovery_client_;