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

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

Issue 2426503002: Make printing work better with OOPIF. (Closed)
Patch Set: rebase, many cleanups have been committed 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 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 #endif 465 #endif
466 466
467 #if !defined(DISABLE_NACL) 467 #if !defined(DISABLE_NACL)
468 new nacl::NaClHelper(render_frame); 468 new nacl::NaClHelper(render_frame);
469 #endif 469 #endif
470 470
471 #if defined(FULL_SAFE_BROWSING) 471 #if defined(FULL_SAFE_BROWSING)
472 safe_browsing::ThreatDOMDetails::Create(render_frame); 472 safe_browsing::ThreatDOMDetails::Create(render_frame);
473 #endif 473 #endif
474 474
475 #if BUILDFLAG(ENABLE_PRINTING)
476 new printing::PrintWebViewHelper(
477 render_frame, base::MakeUnique<ChromePrintWebViewHelperDelegate>());
478 #endif
479
475 new NetErrorHelper(render_frame); 480 new NetErrorHelper(render_frame);
476 481
477 if (render_frame->IsMainFrame()) { 482 if (render_frame->IsMainFrame()) {
478 // Only attach MetricsRenderFrameObserver to the main frame, since 483 // Only attach MetricsRenderFrameObserver to the main frame, since
479 // we only want to log page load metrics for the main frame. 484 // we only want to log page load metrics for the main frame.
480 new page_load_metrics::MetricsRenderFrameObserver(render_frame); 485 new page_load_metrics::MetricsRenderFrameObserver(render_frame);
481 } else { 486 } else {
482 // Avoid any race conditions from having the browser tell subframes that 487 // Avoid any race conditions from having the browser tell subframes that
483 // they're prerendering. 488 // they're prerendering.
484 if (prerender::PrerenderHelper::IsPrerendering( 489 if (prerender::PrerenderHelper::IsPrerendering(
(...skipping 28 matching lines...) Expand all
513 new subresource_filter::SubresourceFilterAgent( 518 new subresource_filter::SubresourceFilterAgent(
514 render_frame, subresource_filter_ruleset_dealer_.get()); 519 render_frame, subresource_filter_ruleset_dealer_.get());
515 } 520 }
516 } 521 }
517 522
518 void ChromeContentRendererClient::RenderViewCreated( 523 void ChromeContentRendererClient::RenderViewCreated(
519 content::RenderView* render_view) { 524 content::RenderView* render_view) {
520 #if defined(ENABLE_EXTENSIONS) 525 #if defined(ENABLE_EXTENSIONS)
521 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view); 526 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view);
522 #endif 527 #endif
523 #if BUILDFLAG(ENABLE_PRINTING) 528
524 new printing::PrintWebViewHelper(
525 render_view, std::unique_ptr<printing::PrintWebViewHelper::Delegate>(
526 new ChromePrintWebViewHelperDelegate()));
527 #endif
528 #if defined(ENABLE_SPELLCHECK) 529 #if defined(ENABLE_SPELLCHECK)
529 new SpellCheckProvider(render_view, spellcheck_.get()); 530 new SpellCheckProvider(render_view, spellcheck_.get());
530 #endif 531 #endif
531 new prerender::PrerendererClient(render_view); 532 new prerender::PrerendererClient(render_view);
532 533
533 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 534 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
534 if (command_line->HasSwitch(switches::kInstantProcess)) 535 if (command_line->HasSwitch(switches::kInstantProcess))
535 new SearchBox(render_view); 536 new SearchBox(render_view);
536 537
537 new ChromeRenderViewObserver(render_view, web_cache_impl_.get()); 538 new ChromeRenderViewObserver(render_view, web_cache_impl_.get());
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
1479 1480
1480 url::Replacements<char> r; 1481 url::Replacements<char> r;
1481 r.SetPath(path.c_str(), url::Component(0, path.length())); 1482 r.SetPath(path.c_str(), url::Component(0, path.length()));
1482 1483
1483 if (result == internal::NUM_PLUGIN_ERROR) 1484 if (result == internal::NUM_PLUGIN_ERROR)
1484 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; 1485 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS;
1485 1486
1486 RecordYouTubeRewriteUMA(result); 1487 RecordYouTubeRewriteUMA(result);
1487 return corrected_url.ReplaceComponents(r); 1488 return corrected_url.ReplaceComponents(r);
1488 } 1489 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698