chrome/browser/autocomplete/keyword_provider.h - Issue 320713002: Revert of Omnibox: Combine Two Input Type Enums into One

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/keyword_provider.h

Issue 320713002: Revert of Omnibox: Combine Two Input Type Enums into One (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

Index: chrome/browser/autocomplete/keyword_provider.h

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

index 18575349171fca7d0803dee399baf446db490a04..d2a22d496219380e5661468ae89c117dbfbe4128 100644

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

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

@@ -18,7 +18,6 @@

#include "base/memory/scoped_ptr.h"

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

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

-#include "components/metrics/proto/omnibox_input_type.pb.h"

class KeywordExtensionsDelegate;

class Profile;

@@ -115,7 +114,7 @@

// matches" mode, and whether the keyword supports replacement.

// If |allow_exact_keyword_match| is false, the relevance for complete

// keywords that support replacements is degraded.

- static int CalculateRelevance(metrics::OmniboxInputType::Type type,

+ static int CalculateRelevance(AutocompleteInput::Type type,

bool complete,

bool support_replacement,

bool prefer_keyword,