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

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

Issue 2426503002: Make printing work better with OOPIF. (Closed)
Patch Set: Fix build, nits 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 defined(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 MainRenderFrameObserver to the main frame, since 483 // Only attach MainRenderFrameObserver 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 // Similarly, PageLoadHistograms are currently only collected for the main 486 // Similarly, PageLoadHistograms are currently only collected for the main
482 // frame. 487 // frame.
483 new PageLoadHistograms(render_frame); 488 new PageLoadHistograms(render_frame);
484 } else { 489 } else {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 defined(ENABLE_EXTENSIONS) 528 #if defined(ENABLE_EXTENSIONS)
524 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view); 529 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view);
525 #endif 530 #endif
526 #if defined(ENABLE_PRINTING) 531
527 new printing::PrintWebViewHelper(
528 render_view, std::unique_ptr<printing::PrintWebViewHelper::Delegate>(
529 new ChromePrintWebViewHelperDelegate()));
530 #endif
531 #if defined(ENABLE_SPELLCHECK) 532 #if defined(ENABLE_SPELLCHECK)
532 new SpellCheckProvider(render_view, spellcheck_.get()); 533 new SpellCheckProvider(render_view, spellcheck_.get());
533 #endif 534 #endif
534 new prerender::PrerendererClient(render_view); 535 new prerender::PrerendererClient(render_view);
535 536
536 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 537 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
537 if (command_line->HasSwitch(switches::kInstantProcess)) 538 if (command_line->HasSwitch(switches::kInstantProcess))
538 new SearchBox(render_view); 539 new SearchBox(render_view);
539 540
540 new ChromeRenderViewObserver(render_view, web_cache_impl_.get()); 541 new ChromeRenderViewObserver(render_view, web_cache_impl_.get());
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after
1478 1479
1479 url::Replacements<char> r; 1480 url::Replacements<char> r;
1480 r.SetPath(path.c_str(), url::Component(0, path.length())); 1481 r.SetPath(path.c_str(), url::Component(0, path.length()));
1481 1482
1482 if (result == internal::NUM_PLUGIN_ERROR) 1483 if (result == internal::NUM_PLUGIN_ERROR)
1483 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; 1484 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS;
1484 1485
1485 RecordYouTubeRewriteUMA(result); 1486 RecordYouTubeRewriteUMA(result);
1486 return corrected_url.ReplaceComponents(r); 1487 return corrected_url.ReplaceComponents(r);
1487 } 1488 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698