chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.cc - Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING.

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/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.cc

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tue Nov 4 16:01:27 PST 2014 Created 6 years, 1 month 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

« build/common.gypi ('K') | « chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc ('k') | chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc » ('j') | printing/printing_context_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.cc

diff --git a/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.cc b/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.cc

index a24a2560858ec14c1c054d3f6f604e098ff6f317..00a3003f7ee41eead1abaa0181b22f0ddbdde774 100644

--- a/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.cc

+++ b/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.cc

@@ -12,12 +12,12 @@

#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"

#if defined(ENABLE_PRINTING)

-#if defined(ENABLE_FULL_PRINTING)

+#if defined(ENABLE_PRINT_PREVIEW)

#include "chrome/browser/printing/print_preview_message_handler.h"

#include "chrome/browser/printing/print_view_manager.h"

#else

#include "chrome/browser/printing/print_view_manager_basic.h"

-#endif // defined(ENABLE_FULL_PRINTING)

+#endif // defined(ENABLE_PRINT_PREVIEW)

#endif // defined(ENABLE_PRINTING)

namespace extensions {

@@ -34,12 +34,12 @@ ChromeMimeHandlerViewGuestDelegate::~ChromeMimeHandlerViewGuestDelegate() {

void ChromeMimeHandlerViewGuestDelegate::AttachHelpers() {

content::WebContents* web_contents = guest_->web_contents();

#if defined(ENABLE_PRINTING)

-#if defined(ENABLE_FULL_PRINTING)

+#if defined(ENABLE_PRINT_PREVIEW)

printing::PrintViewManager::CreateForWebContents(web_contents);

printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents);

#else

printing::PrintViewManagerBasic::CreateForWebContents(web_contents);

-#endif // defined(ENABLE_FULL_PRINTING)

+#endif // defined(ENABLE_PRINT_PREVIEW)

#endif // defined(ENABLE_PRINTING)

pdf::PDFWebContentsHelper::CreateForWebContentsWithClient(

web_contents,