chrome/browser/autocomplete/autocomplete_controller.h - 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/autocomplete/autocomplete_controller.h

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

Patch Set: Response to review 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

« no previous file with comments | « chrome/browser/autocomplete/autocomplete_classifier_factory.cc ('k') | chrome/browser/autocomplete/autocomplete_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/autocomplete/autocomplete_controller.h

diff --git a/chrome/browser/autocomplete/autocomplete_controller.h b/chrome/browser/autocomplete/autocomplete_controller.h

index 1fc45612db4c06be7cf0e5051bc0b709784686d2..1eab0d28f63ff76e845bff5693b873ca9862c8f1 100644

--- a/chrome/browser/autocomplete/autocomplete_controller.h

+++ b/chrome/browser/autocomplete/autocomplete_controller.h

@@ -12,16 +12,15 @@

#include "base/strings/string16.h"

#include "base/time/time.h"

#include "base/timer/timer.h"

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

#include "components/omnibox/autocomplete_input.h"

#include "components/omnibox/autocomplete_provider.h"

+#include "components/omnibox/autocomplete_provider_client.h"

#include "components/omnibox/autocomplete_provider_listener.h"

#include "components/omnibox/autocomplete_result.h"

class AutocompleteControllerDelegate;

class HistoryURLProvider;

class KeywordProvider;

-class Profile;

class SearchProvider;

class TemplateURLService;

class ZeroSuggestProvider;

@@ -54,8 +53,7 @@ class AutocompleteController : public AutocompleteProviderListener {

// that will (potentially, depending on platform, flags, etc.) be

// instantiated. |template_url_service| is used to create URLs from the

// autocomplete results.

- AutocompleteController(Profile* profile,

- TemplateURLService* template_url_service,

+ AutocompleteController(scoped_ptr<AutocompleteProviderClient> provider_client,

AutocompleteControllerDelegate* delegate,

int provider_types);

~AutocompleteController() override;

@@ -201,7 +199,7 @@ class AutocompleteController : public AutocompleteProviderListener {

AutocompleteControllerDelegate* delegate_;

// The client passed to the providers.

- scoped_ptr<ChromeAutocompleteProviderClient> provider_client_;

+ scoped_ptr<AutocompleteProviderClient> provider_client_;

// A list of all providers.

Providers providers_;