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

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 Kausalya's comments, added TODO and bug reference for transition from JS to a better way. 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 16 matching lines...) Expand all
27 #include "chrome/common/url_constants.h" 27 #include "chrome/common/url_constants.h"
28 #include "chrome/grit/generated_resources.h" 28 #include "chrome/grit/generated_resources.h"
29 #include "chrome/grit/locale_settings.h" 29 #include "chrome/grit/locale_settings.h"
30 #include "chrome/grit/renderer_resources.h" 30 #include "chrome/grit/renderer_resources.h"
31 #include "chrome/renderer/banners/app_banner_client.h" 31 #include "chrome/renderer/banners/app_banner_client.h"
32 #include "chrome/renderer/benchmarking_extension.h" 32 #include "chrome/renderer/benchmarking_extension.h"
33 #include "chrome/renderer/chrome_render_frame_observer.h" 33 #include "chrome/renderer/chrome_render_frame_observer.h"
34 #include "chrome/renderer/chrome_render_process_observer.h" 34 #include "chrome/renderer/chrome_render_process_observer.h"
35 #include "chrome/renderer/chrome_render_view_observer.h" 35 #include "chrome/renderer/chrome_render_view_observer.h"
36 #include "chrome/renderer/content_settings_observer.h" 36 #include "chrome/renderer/content_settings_observer.h"
37 #include "chrome/renderer/contextualsearch/contextual_search_wrapper.h"
37 #include "chrome/renderer/external_extension.h" 38 #include "chrome/renderer/external_extension.h"
38 #include "chrome/renderer/loadtimes_extension_bindings.h" 39 #include "chrome/renderer/loadtimes_extension_bindings.h"
39 #include "chrome/renderer/media/chrome_key_systems.h" 40 #include "chrome/renderer/media/chrome_key_systems.h"
40 #include "chrome/renderer/net/net_error_helper.h" 41 #include "chrome/renderer/net/net_error_helper.h"
41 #include "chrome/renderer/net_benchmarking_extension.h" 42 #include "chrome/renderer/net_benchmarking_extension.h"
42 #include "chrome/renderer/page_load_histograms.h" 43 #include "chrome/renderer/page_load_histograms.h"
43 #include "chrome/renderer/pepper/pepper_helper.h" 44 #include "chrome/renderer/pepper/pepper_helper.h"
44 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h" 45 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h"
45 #include "chrome/renderer/plugins/plugin_preroller.h" 46 #include "chrome/renderer/plugins/plugin_preroller.h"
46 #include "chrome/renderer/plugins/plugin_uma.h" 47 #include "chrome/renderer/plugins/plugin_uma.h"
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 #endif 552 #endif
552 553
553 if (render_frame->IsMainFrame()) { 554 if (render_frame->IsMainFrame()) {
554 // Only attach NetErrorHelper to the main frame, since only the main frame 555 // Only attach NetErrorHelper to the main frame, since only the main frame
555 // should get error pages. 556 // should get error pages.
556 new NetErrorHelper(render_frame); 557 new NetErrorHelper(render_frame);
557 558
558 // Only attach MainRenderFrameObserver to the main frame, since 559 // Only attach MainRenderFrameObserver to the main frame, since
559 // we only want to log page load metrics for the main frame. 560 // we only want to log page load metrics for the main frame.
560 new page_load_metrics::MetricsRenderFrameObserver(render_frame); 561 new page_load_metrics::MetricsRenderFrameObserver(render_frame);
562
563 // Install Contextual Search support in the main frame if needed.
564 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
565 switches::kContextualSearchProcess)) {
pedro (no code reviews) 2015/10/20 01:24:41 Is there a better way to identify a Contextual Sea
Donn Denman 2015/10/20 21:56:46 No better way that I know of. I don't think it's
566 search::ContextualSearchWrapper::Install(render_frame->GetWebFrame());
567 }
561 } else { 568 } else {
562 // Avoid any race conditions from having the browser tell subframes that 569 // Avoid any race conditions from having the browser tell subframes that
563 // they're prerendering. 570 // they're prerendering.
564 if (prerender::PrerenderHelper::IsPrerendering( 571 if (prerender::PrerenderHelper::IsPrerendering(
565 render_frame->GetRenderView()->GetMainRenderFrame())) { 572 render_frame->GetRenderView()->GetMainRenderFrame())) {
566 new prerender::PrerenderHelper(render_frame); 573 new prerender::PrerenderHelper(render_frame);
567 } 574 }
568 } 575 }
569 576
570 // Set up a mojo service to test if this page is a distiller page. 577 // Set up a mojo service to test if this page is a distiller page.
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1675 // chrome.system.network.getNetworkInterfaces provides the same 1682 // chrome.system.network.getNetworkInterfaces provides the same
1676 // information. Also, the enforcement of sending and binding UDP is already done 1683 // information. Also, the enforcement of sending and binding UDP is already done
1677 // by chrome extension permission model. 1684 // by chrome extension permission model.
1678 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { 1685 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() {
1679 #if defined(ENABLE_EXTENSIONS) 1686 #if defined(ENABLE_EXTENSIONS)
1680 return !IsStandaloneExtensionProcess(); 1687 return !IsStandaloneExtensionProcess();
1681 #else 1688 #else
1682 return true; 1689 return true;
1683 #endif 1690 #endif
1684 } 1691 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698