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

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

Issue 2426503002: Make printing work better with OOPIF. (Closed)
Patch Set: Fix build, fix some tests Created 4 years, 2 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 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 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 #endif 463 #endif
464 464
465 #if !defined(DISABLE_NACL) 465 #if !defined(DISABLE_NACL)
466 new nacl::NaClHelper(render_frame); 466 new nacl::NaClHelper(render_frame);
467 #endif 467 #endif
468 468
469 #if defined(FULL_SAFE_BROWSING) 469 #if defined(FULL_SAFE_BROWSING)
470 safe_browsing::ThreatDOMDetails::Create(render_frame); 470 safe_browsing::ThreatDOMDetails::Create(render_frame);
471 #endif 471 #endif
472 472
473 #if defined(ENABLE_PRINTING)
474 new printing::PrintWebViewHelper(
475 render_frame, base::MakeUnique<ChromePrintWebViewHelperDelegate>());
476 #endif
477
473 new NetErrorHelper(render_frame); 478 new NetErrorHelper(render_frame);
474 479
475 if (render_frame->IsMainFrame()) { 480 if (render_frame->IsMainFrame()) {
476 // Only attach MainRenderFrameObserver to the main frame, since 481 // Only attach MainRenderFrameObserver to the main frame, since
477 // we only want to log page load metrics for the main frame. 482 // we only want to log page load metrics for the main frame.
478 new page_load_metrics::MetricsRenderFrameObserver(render_frame); 483 new page_load_metrics::MetricsRenderFrameObserver(render_frame);
479 // Similarly, PageLoadHistograms are currently only collected for the main 484 // Similarly, PageLoadHistograms are currently only collected for the main
480 // frame. 485 // frame.
481 new PageLoadHistograms(render_frame); 486 new PageLoadHistograms(render_frame);
482 } else { 487 } else {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 new subresource_filter::SubresourceFilterAgent( 519 new subresource_filter::SubresourceFilterAgent(
515 render_frame, subresource_filter_ruleset_dealer_.get()); 520 render_frame, subresource_filter_ruleset_dealer_.get());
516 } 521 }
517 } 522 }
518 523
519 void ChromeContentRendererClient::RenderViewCreated( 524 void ChromeContentRendererClient::RenderViewCreated(
520 content::RenderView* render_view) { 525 content::RenderView* render_view) {
521 #if defined(ENABLE_EXTENSIONS) 526 #if defined(ENABLE_EXTENSIONS)
522 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view); 527 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view);
523 #endif 528 #endif
524 #if defined(ENABLE_PRINTING) 529
525 new printing::PrintWebViewHelper(
526 render_view, std::unique_ptr<printing::PrintWebViewHelper::Delegate>(
527 new ChromePrintWebViewHelperDelegate()));
528 #endif
529 #if defined(ENABLE_SPELLCHECK) 530 #if defined(ENABLE_SPELLCHECK)
530 new SpellCheckProvider(render_view, spellcheck_.get()); 531 new SpellCheckProvider(render_view, spellcheck_.get());
531 #endif 532 #endif
532 new prerender::PrerendererClient(render_view); 533 new prerender::PrerendererClient(render_view);
533 534
534 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 535 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
535 if (command_line->HasSwitch(switches::kInstantProcess)) 536 if (command_line->HasSwitch(switches::kInstantProcess))
536 new SearchBox(render_view); 537 new SearchBox(render_view);
537 538
538 new ChromeRenderViewObserver(render_view, web_cache_impl_.get()); 539 new ChromeRenderViewObserver(render_view, web_cache_impl_.get());
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 1484
1484 url::Replacements<char> r; 1485 url::Replacements<char> r;
1485 r.SetPath(path.c_str(), url::Component(0, path.length())); 1486 r.SetPath(path.c_str(), url::Component(0, path.length()));
1486 1487
1487 if (result == internal::NUM_PLUGIN_ERROR) 1488 if (result == internal::NUM_PLUGIN_ERROR)
1488 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; 1489 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS;
1489 1490
1490 RecordYouTubeRewriteUMA(result); 1491 RecordYouTubeRewriteUMA(result);
1491 return corrected_url.ReplaceComponents(r); 1492 return corrected_url.ReplaceComponents(r);
1492 } 1493 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698