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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 7910d84a9867a3b0e6b7b9220ddec95c07cb4469..18ac83a8ba770e5b4a1cde5d58fc81082abd5dbf 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -33,6 +33,7 @@
#include "chrome/renderer/chrome_render_process_observer.h"
#include "chrome/renderer/chrome_render_view_observer.h"
#include "chrome/renderer/content_settings_observer.h"
+#include "chrome/renderer/contextualsearch/contextual_search_wrapper.h"
#include "chrome/renderer/external_extension.h"
#include "chrome/renderer/loadtimes_extension_bindings.h"
#include "chrome/renderer/media/chrome_key_systems.h"
@@ -514,6 +515,12 @@ void ChromeContentRendererClient::RenderFrameCreated(
// Only attach MainRenderFrameObserver to the main frame, since
// we only want to log page load metrics for the main frame.
new page_load_metrics::MetricsRenderFrameObserver(render_frame);
+
+ // Install Contextual Search support in the main frame if needed.
+ 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
+ switches::kContextualSearchProcess)) {
+ search::ContextualSearchWrapper::Install(render_frame->GetWebFrame());
+ }
} else {
// Avoid any race conditions from having the browser tell subframes that
// they're prerendering.

Powered by Google App Engine
This is Rietveld 408576698