Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 #include "extensions/common/extension_set.h" 119 #include "extensions/common/extension_set.h"
120 #include "extensions/common/extension_urls.h" 120 #include "extensions/common/extension_urls.h"
121 #include "extensions/common/switches.h" 121 #include "extensions/common/switches.h"
122 #include "extensions/renderer/dispatcher.h" 122 #include "extensions/renderer/dispatcher.h"
123 #include "extensions/renderer/extension_helper.h" 123 #include "extensions/renderer/extension_helper.h"
124 #include "extensions/renderer/extensions_render_frame_observer.h" 124 #include "extensions/renderer/extensions_render_frame_observer.h"
125 #include "extensions/renderer/guest_view/guest_view_container.h" 125 #include "extensions/renderer/guest_view/guest_view_container.h"
126 #include "extensions/renderer/script_context.h" 126 #include "extensions/renderer/script_context.h"
127 #endif 127 #endif
128 128
129 #if defined(ENABLE_FULL_PRINTING) 129 #if defined(ENABLE_PRINT_PREVIEW)
130 #include "chrome/renderer/pepper/chrome_pdf_print_client.h" 130 #include "chrome/renderer/pepper/chrome_pdf_print_client.h"
131 #endif 131 #endif
132 132
133 #if defined(ENABLE_SPELLCHECK) 133 #if defined(ENABLE_SPELLCHECK)
134 #include "chrome/renderer/spellchecker/spellcheck.h" 134 #include "chrome/renderer/spellchecker/spellcheck.h"
135 #include "chrome/renderer/spellchecker/spellcheck_provider.h" 135 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
136 #endif 136 #endif
137 137
138 #if defined(ENABLE_WEBRTC) 138 #if defined(ENABLE_WEBRTC)
139 #include "chrome/renderer/media/webrtc_logging_message_filter.h" 139 #include "chrome/renderer/media/webrtc_logging_message_filter.h"
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( 427 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
428 extension_resource_scheme); 428 extension_resource_scheme);
429 429
430 #if defined(OS_WIN) 430 #if defined(OS_WIN)
431 // Report if the renderer process has been patched by chrome_elf. 431 // Report if the renderer process has been patched by chrome_elf.
432 // TODO(csharp): Remove once the renderer is no longer getting 432 // TODO(csharp): Remove once the renderer is no longer getting
433 // patched this way. 433 // patched this way.
434 if (blacklist::IsBlacklistInitialized()) 434 if (blacklist::IsBlacklistInitialized())
435 UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true); 435 UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true);
436 #endif 436 #endif
437 #if defined(ENABLE_FULL_PRINTING) 437 #if defined(ENABLE_PRINT_PREVIEW)
438 pdf_print_client_.reset(new ChromePDFPrintClient()); 438 pdf_print_client_.reset(new ChromePDFPrintClient());
439 pdf::PPB_PDF_Impl::SetPrintClient(pdf_print_client_.get()); 439 pdf::PPB_PDF_Impl::SetPrintClient(pdf_print_client_.get());
440 #endif 440 #endif
441 } 441 }
442 442
443 void ChromeContentRendererClient::RenderFrameCreated( 443 void ChromeContentRendererClient::RenderFrameCreated(
444 content::RenderFrame* render_frame) { 444 content::RenderFrame* render_frame) {
445 new ChromeRenderFrameObserver(render_frame); 445 new ChromeRenderFrameObserver(render_frame);
446 446
447 extensions::Dispatcher* ext_dispatcher = NULL; 447 extensions::Dispatcher* ext_dispatcher = NULL;
(...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after
1596 content::BrowserPluginDelegate* 1596 content::BrowserPluginDelegate*
1597 ChromeContentRendererClient::CreateBrowserPluginDelegate( 1597 ChromeContentRendererClient::CreateBrowserPluginDelegate(
1598 content::RenderFrame* render_frame, 1598 content::RenderFrame* render_frame,
1599 const std::string& mime_type) { 1599 const std::string& mime_type) {
1600 #if defined(ENABLE_EXTENSIONS) 1600 #if defined(ENABLE_EXTENSIONS)
1601 return new extensions::GuestViewContainer(render_frame, mime_type); 1601 return new extensions::GuestViewContainer(render_frame, mime_type);
1602 #else 1602 #else
1603 return NULL; 1603 return NULL;
1604 #endif 1604 #endif
1605 } 1605 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698