chrome/browser/chrome_content_browser_client.cc - Issue 1385663002: [Contextual Search] Add Mojo-enabled API component.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1385663002: [Contextual Search] Add Mojo-enabled API component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changed the CS API controller to not be a notification observer. 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

« chrome/browser/android/contextualsearch/contextual_search_manager.cc ('K') | « chrome/browser/android/contextualsearch/contextual_search_manager.cc ('k') | chrome/browser/search/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 71adb8355ef636cdc07f1de89521c80a5813a689..e761ea2d9d2b5d81e169b83ab1041708d2540997 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -61,6 +61,7 @@

#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"

#include "chrome/browser/safe_browsing/safe_browsing_service.h"

#include "chrome/browser/safe_browsing/ui_manager.h"

+#include "chrome/browser/search/contextual_search_api_controller.h"

#include "chrome/browser/search/instant_service.h"

#include "chrome/browser/search/instant_service_factory.h"

#include "chrome/browser/search/search.h"

@@ -1455,6 +1456,10 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(

if (instant_service &&

instant_service->IsInstantProcess(process->GetID()))

command_line->AppendSwitch(switches::kInstantProcess);

+ if (ContextualSearchApiController::GetInstance()

+ ->IsContextualSearchProcess(process->GetID()))

+ command_line->AppendSwitch(switches::kContextualSearchProcess);

}

if (IsAutoReloadEnabled())