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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 2508923003: Make printing work better with OOPIF. (try 2) (Closed)
Patch Set: Fix android_webview Created 4 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 <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 #endif 468 #endif
469 469
470 #if !defined(DISABLE_NACL) 470 #if !defined(DISABLE_NACL)
471 new nacl::NaClHelper(render_frame); 471 new nacl::NaClHelper(render_frame);
472 #endif 472 #endif
473 473
474 #if defined(FULL_SAFE_BROWSING) 474 #if defined(FULL_SAFE_BROWSING)
475 safe_browsing::ThreatDOMDetails::Create(render_frame); 475 safe_browsing::ThreatDOMDetails::Create(render_frame);
476 #endif 476 #endif
477 477
478 #if BUILDFLAG(ENABLE_PRINTING)
479 new printing::PrintWebViewHelper(
480 render_frame, base::MakeUnique<ChromePrintWebViewHelperDelegate>());
481 #endif
482
478 new NetErrorHelper(render_frame); 483 new NetErrorHelper(render_frame);
479 484
480 if (render_frame->IsMainFrame()) { 485 if (render_frame->IsMainFrame()) {
481 // Only attach MetricsRenderFrameObserver to the main frame, since 486 // Only attach MetricsRenderFrameObserver to the main frame, since
482 // we only want to log page load metrics for the main frame. 487 // we only want to log page load metrics for the main frame.
483 new page_load_metrics::MetricsRenderFrameObserver(render_frame); 488 new page_load_metrics::MetricsRenderFrameObserver(render_frame);
484 } else { 489 } else {
485 // Avoid any race conditions from having the browser tell subframes that 490 // Avoid any race conditions from having the browser tell subframes that
486 // they're prerendering. 491 // they're prerendering.
487 if (prerender::PrerenderHelper::IsPrerendering( 492 if (prerender::PrerenderHelper::IsPrerendering(
(...skipping 28 matching lines...) Expand all
516 new subresource_filter::SubresourceFilterAgent( 521 new subresource_filter::SubresourceFilterAgent(
517 render_frame, subresource_filter_ruleset_dealer_.get()); 522 render_frame, subresource_filter_ruleset_dealer_.get());
518 } 523 }
519 } 524 }
520 525
521 void ChromeContentRendererClient::RenderViewCreated( 526 void ChromeContentRendererClient::RenderViewCreated(
522 content::RenderView* render_view) { 527 content::RenderView* render_view) {
523 #if BUILDFLAG(ENABLE_EXTENSIONS) 528 #if BUILDFLAG(ENABLE_EXTENSIONS)
524 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view); 529 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view);
525 #endif 530 #endif
526 #if BUILDFLAG(ENABLE_PRINTING)
527 new printing::PrintWebViewHelper(
528 render_view, std::unique_ptr<printing::PrintWebViewHelper::Delegate>(
529 new ChromePrintWebViewHelperDelegate()));
530 #endif
531 #if BUILDFLAG(ENABLE_SPELLCHECK) 531 #if BUILDFLAG(ENABLE_SPELLCHECK)
532 new SpellCheckProvider(render_view, spellcheck_.get()); 532 new SpellCheckProvider(render_view, spellcheck_.get());
533 #endif 533 #endif
534 new prerender::PrerendererClient(render_view); 534 new prerender::PrerendererClient(render_view);
535 535
536 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 536 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
537 if (command_line->HasSwitch(switches::kInstantProcess)) 537 if (command_line->HasSwitch(switches::kInstantProcess))
538 new SearchBox(render_view); 538 new SearchBox(render_view);
539 539
540 new ChromeRenderViewObserver(render_view, web_cache_impl_.get()); 540 new ChromeRenderViewObserver(render_view, web_cache_impl_.get());
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
1470 1470
1471 url::Replacements<char> r; 1471 url::Replacements<char> r;
1472 r.SetPath(path.c_str(), url::Component(0, path.length())); 1472 r.SetPath(path.c_str(), url::Component(0, path.length()));
1473 1473
1474 if (result == internal::NUM_PLUGIN_ERROR) 1474 if (result == internal::NUM_PLUGIN_ERROR)
1475 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; 1475 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS;
1476 1476
1477 RecordYouTubeRewriteUMA(result); 1477 RecordYouTubeRewriteUMA(result);
1478 return corrected_url.ReplaceComponents(r); 1478 return corrected_url.ReplaceComponents(r);
1479 } 1479 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc ('k') | chrome/renderer/chrome_render_frame_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698