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

Unified Diff: chrome/browser/search/search.h

Issue 768413003: TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge Created 5 years, 11 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/chromeos/login/ui/simple_web_view_dialog.cc ('k') | chrome/browser/search/search.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search/search.h
diff --git a/chrome/browser/search/search.h b/chrome/browser/search/search.h
index 6e5d9ba03c50ed2a6f80949f2ac2ba267d8d015e..d952e9457d65ab36c689e3274cb533529d36acdc 100644
--- a/chrome/browser/search/search.h
+++ b/chrome/browser/search/search.h
@@ -40,21 +40,6 @@ enum OptInState {
INSTANT_EXTENDED_OPT_IN_STATE_ENUM_COUNT,
};
-enum DisplaySearchButtonConditions {
- DISPLAY_SEARCH_BUTTON_NEVER,
- DISPLAY_SEARCH_BUTTON_FOR_STR, // STR = Search Term Replacement
- DISPLAY_SEARCH_BUTTON_FOR_STR_OR_IIP, // IIP = Input In Progress
- DISPLAY_SEARCH_BUTTON_ALWAYS,
- DISPLAY_SEARCH_BUTTON_NUM_VALUES,
-};
-
-enum OriginChipCondition {
- ORIGIN_CHIP_DISABLED = 0,
- ORIGIN_CHIP_ALWAYS,
- ORIGIN_CHIP_ON_SRP,
- ORIGIN_CHIP_NUM_VALUES,
-};
-
// Use this value for "start margin" to prevent the "es_sm" parameter from
// being used.
extern const int kDisableStartMargin;
@@ -178,18 +163,6 @@ bool ShouldReuseInstantSearchBasePage();
// TODO(kmadhusu): Remove this function and update the call sites.
GURL GetLocalInstantURL(Profile* profile);
-// Returns when we should show a search button in the omnibox. This may be any
-// of several values, some of which depend on whether the underlying state of
-// the page would normally be to perform search term replacement; see also
-// ToolbarModel::WouldPerformSearchTermReplacement().
-DisplaySearchButtonConditions GetDisplaySearchButtonConditions();
-
-// Returns true if the origin chip should be shown.
-bool ShouldDisplayOriginChip();
-
-// Returns a value indicating when the origin chip should be shown.
-OriginChipCondition GetOriginChipCondition();
-
// Returns true if the local new tab page should show a Google logo and search
// box for users whose default search provider is Google, or false if not.
bool ShouldShowGoogleLocalNTP();
« no previous file with comments | « chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc ('k') | chrome/browser/search/search.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698