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

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

Issue 1385663002: [Contextual Search] Add Mojo-enabled API component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Pedro's comments on naming methods in ContextualSearchApiController. Created 5 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 "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 15 matching lines...) Expand all
26 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
27 #include "chrome/grit/generated_resources.h" 27 #include "chrome/grit/generated_resources.h"
28 #include "chrome/grit/locale_settings.h" 28 #include "chrome/grit/locale_settings.h"
29 #include "chrome/grit/renderer_resources.h" 29 #include "chrome/grit/renderer_resources.h"
30 #include "chrome/renderer/banners/app_banner_client.h" 30 #include "chrome/renderer/banners/app_banner_client.h"
31 #include "chrome/renderer/benchmarking_extension.h" 31 #include "chrome/renderer/benchmarking_extension.h"
32 #include "chrome/renderer/chrome_render_frame_observer.h" 32 #include "chrome/renderer/chrome_render_frame_observer.h"
33 #include "chrome/renderer/chrome_render_process_observer.h" 33 #include "chrome/renderer/chrome_render_process_observer.h"
34 #include "chrome/renderer/chrome_render_view_observer.h" 34 #include "chrome/renderer/chrome_render_view_observer.h"
35 #include "chrome/renderer/content_settings_observer.h" 35 #include "chrome/renderer/content_settings_observer.h"
36 #include "chrome/renderer/contextualsearch/contextual_search_wrapper.h"
36 #include "chrome/renderer/external_extension.h" 37 #include "chrome/renderer/external_extension.h"
37 #include "chrome/renderer/loadtimes_extension_bindings.h" 38 #include "chrome/renderer/loadtimes_extension_bindings.h"
38 #include "chrome/renderer/media/chrome_key_systems.h" 39 #include "chrome/renderer/media/chrome_key_systems.h"
39 #include "chrome/renderer/net/net_error_helper.h" 40 #include "chrome/renderer/net/net_error_helper.h"
40 #include "chrome/renderer/net_benchmarking_extension.h" 41 #include "chrome/renderer/net_benchmarking_extension.h"
41 #include "chrome/renderer/page_load_histograms.h" 42 #include "chrome/renderer/page_load_histograms.h"
42 #include "chrome/renderer/pepper/pepper_helper.h" 43 #include "chrome/renderer/pepper/pepper_helper.h"
43 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h" 44 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h"
44 #include "chrome/renderer/plugins/plugin_preroller.h" 45 #include "chrome/renderer/plugins/plugin_preroller.h"
45 #include "chrome/renderer/plugins/plugin_uma.h" 46 #include "chrome/renderer/plugins/plugin_uma.h"
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 #endif 508 #endif
508 509
509 if (render_frame->IsMainFrame()) { 510 if (render_frame->IsMainFrame()) {
510 // Only attach NetErrorHelper to the main frame, since only the main frame 511 // Only attach NetErrorHelper to the main frame, since only the main frame
511 // should get error pages. 512 // should get error pages.
512 new NetErrorHelper(render_frame); 513 new NetErrorHelper(render_frame);
513 514
514 // Only attach MainRenderFrameObserver to the main frame, since 515 // Only attach MainRenderFrameObserver to the main frame, since
515 // we only want to log page load metrics for the main frame. 516 // we only want to log page load metrics for the main frame.
516 new page_load_metrics::MetricsRenderFrameObserver(render_frame); 517 new page_load_metrics::MetricsRenderFrameObserver(render_frame);
518
519 // Install Contextual Search support in the main frame if needed.
520 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
Donn Denman 2015/10/28 00:26:56 Charlie, I'm thinking that we should change this t
Charlie Reis 2015/10/28 19:51:44 Scoping it to a RenderFrame isn't a bad idea, but
521 switches::kContextualSearchProcess)) {
522 search::ContextualSearchWrapper::Install(render_frame->GetWebFrame());
523 }
517 } else { 524 } else {
518 // Avoid any race conditions from having the browser tell subframes that 525 // Avoid any race conditions from having the browser tell subframes that
519 // they're prerendering. 526 // they're prerendering.
520 if (prerender::PrerenderHelper::IsPrerendering( 527 if (prerender::PrerenderHelper::IsPrerendering(
521 render_frame->GetRenderView()->GetMainRenderFrame())) { 528 render_frame->GetRenderView()->GetMainRenderFrame())) {
522 new prerender::PrerenderHelper(render_frame); 529 new prerender::PrerenderHelper(render_frame);
523 } 530 }
524 } 531 }
525 532
526 // Set up a mojo service to test if this page is a distiller page. 533 // Set up a mojo service to test if this page is a distiller page.
527 new dom_distiller::DistillerJsRenderFrameObserver( 534 new dom_distiller::DistillerJsRenderFrameObserver(
Donn Denman 2015/10/28 00:26:56 Here's how Dom Distiller enables its API.
528 render_frame, chrome::ISOLATED_WORLD_ID_CHROME_INTERNAL); 535 render_frame, chrome::ISOLATED_WORLD_ID_CHROME_INTERNAL);
529 536
530 PasswordAutofillAgent* password_autofill_agent = 537 PasswordAutofillAgent* password_autofill_agent =
531 new PasswordAutofillAgent(render_frame); 538 new PasswordAutofillAgent(render_frame);
532 PasswordGenerationAgent* password_generation_agent = 539 PasswordGenerationAgent* password_generation_agent =
533 new PasswordGenerationAgent(render_frame, password_autofill_agent); 540 new PasswordGenerationAgent(render_frame, password_autofill_agent);
534 new AutofillAgent(render_frame, password_autofill_agent, 541 new AutofillAgent(render_frame, password_autofill_agent,
535 password_generation_agent); 542 password_generation_agent);
536 } 543 }
537 544
(...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after
1465 // chrome.system.network.getNetworkInterfaces provides the same 1472 // chrome.system.network.getNetworkInterfaces provides the same
1466 // information. Also, the enforcement of sending and binding UDP is already done 1473 // information. Also, the enforcement of sending and binding UDP is already done
1467 // by chrome extension permission model. 1474 // by chrome extension permission model.
1468 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { 1475 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() {
1469 #if defined(ENABLE_EXTENSIONS) 1476 #if defined(ENABLE_EXTENSIONS)
1470 return !IsStandaloneExtensionProcess(); 1477 return !IsStandaloneExtensionProcess();
1471 #else 1478 #else
1472 return true; 1479 return true;
1473 #endif 1480 #endif
1474 } 1481 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698