chrome/browser/ui/webui/print_preview/print_preview_ui.cc - Issue 2885363003: Add policy to use system default printer

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_ui.cc

Issue 2885363003: Add policy to use system default printer (Closed)

Patch Set: Fix test Created 3 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

« chrome/browser/resources/print_preview/data/destination_store.js ('K') | « chrome/browser/ui/browser_ui_prefs.cc ('k') | chrome/common/chrome_switches.h » ('j') | chrome/common/chrome_switches.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/print_preview/print_preview_ui.cc

diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc

index e675add9cbe333c980d660d9cf91846c6aef1b8a..527a33bda8cb00f5d1ae519a79124aee4aaf6bf1 100644

--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc

+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc

@@ -8,6 +8,7 @@

#include <utility>

#include <vector>

+#include "base/command_line.h"

#include "base/feature_list.h"

#include "base/id_map.h"

#include "base/lazy_instance.h"

@@ -31,10 +32,13 @@

#include "chrome/browser/ui/webui/print_preview/print_preview_handler.h"

#include "chrome/browser/ui/webui/theme_source.h"

#include "chrome/common/chrome_features.h"

+#include "chrome/common/chrome_switches.h"

+#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "chrome/grit/browser_resources.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

+#include "components/prefs/pref_service.h"

#include "components/printing/common/print_messages.h"

#include "components/strings/grit/components_strings.h"

#include "content/public/browser/url_data_source.h"

@@ -444,7 +448,15 @@ PrintPreviewUI::PrintPreviewUI(content::WebUI* web_ui)

dialog_closed_(false) {

// Set up the chrome://print/ data source.

Profile* profile = Profile::FromWebUI(web_ui);

- content::WebUIDataSource::Add(profile, CreatePrintPreviewUISource());

+ content::WebUIDataSource* data_source = CreatePrintPreviewUISource();

+ const base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();

+ bool use_system_default_printer =

+ profile->GetPrefs()->GetBoolean(

+ prefs::kUseSystemDefaultPrinterAsDefault) ||

+ cmdline->HasSwitch(switches::kUseSystemDefaultPrinter);

+ data_source->AddBoolean("useSystemDefaultPrinter",

Lei Zhang 2017/06/15 18:29:34 Can we do this in CreatePrintPreviewUISource()? Lo

rbpotter 2017/06/16 02:21:46 Done.

+ use_system_default_printer);

+ content::WebUIDataSource::Add(profile, data_source);

// Set up the chrome://theme/ source.

content::URLDataSource::Add(profile, new ThemeSource(profile));