chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 22577010: Printing: Add a basic printing mode without print preview and cloud print.

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/chrome_web_ui_controller_factory.cc

Issue 22577010: Printing: Add a basic printing mode without print preview and cloud print. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 7 years, 4 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/ui/startup/startup_browser_creator.cc ('k') | chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

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

index 560c344c5b7e5b6c37b8b0460eefa4bed2f66cd9..c9ea885c8edbf54a89a733413b066f38c16078eb 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -42,7 +42,6 @@

#include "chrome/browser/ui/webui/performance_monitor/performance_monitor_ui.h"

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

#include "chrome/browser/ui/webui/predictors/predictors_ui.h"

-#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"

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

#include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"

#include "chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h"

@@ -78,6 +77,10 @@

#include "chrome/browser/ui/webui/media/webrtc_logs_ui.h"

#endif

+#if defined(ENABLE_FULL_PRINTING)

+#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"

+#endif

#if defined(OS_ANDROID)

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

#else

@@ -434,7 +437,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

if (url.host() == chrome::kChromeUIExtensionsFrameHost)

return &NewWebUI<extensions::ExtensionsUI>;

#endif

-#if defined(ENABLE_PRINTING)

+#if defined(ENABLE_FULL_PRINTING)

if (url.host() == chrome::kChromeUIPrintHost &&

!profile->GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled))

return &NewWebUI<PrintPreviewUI>;