chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc - Issue 1192373002: Prepare AutocompleteController for componentization

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/ui/webui/omnibox/omnibox_ui_handler.cc

Issue 1192373002: Prepare AutocompleteController for componentization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@componentize_zero_suggest_provider

Patch Set: Remove stale include Created 5 years, 6 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/autocomplete/search_provider_unittest.cc ('K') | « chrome/browser/ui/views/frame/test_with_browser_view.cc ('k') | chrome/browser/ui/webui/options/home_page_overlay_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

index 9e0f10510bf7f1e389a50d26d8a3948c7b90ca07..617dc06d3ac143f10a8aad0feb54bbbf24fbf470 100644

--- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

+++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

@@ -15,6 +15,7 @@

#include "base/values.h"

#include "chrome/browser/autocomplete/autocomplete_classifier.h"

#include "chrome/browser/autocomplete/autocomplete_controller.h"

+#include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"

#include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/history/history_service_factory.h"

@@ -202,8 +203,7 @@ void OmniboxUIHandler::StartOmniboxQuery(const mojo::String& input_string,

}

void OmniboxUIHandler::ResetController() {

- controller_.reset(new AutocompleteController(profile_,

- TemplateURLServiceFactory::GetForProfile(profile_),

- this,

- AutocompleteClassifier::kDefaultOmniboxProviders));

+ controller_.reset(new AutocompleteController(

+ make_scoped_ptr(new ChromeAutocompleteProviderClient(profile_)), this,

+ AutocompleteClassifier::kDefaultOmniboxProviders));

}