Chromium Code Reviews| Index: chrome/browser/search_engines/template_url.cc |
| diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc |
| index 7d964e40a4f93597968852a4eb57d1c179b62da7..ac94a87021ab06cfaa33b9c549f6ca33b5281da8 100644 |
| --- a/chrome/browser/search_engines/template_url.cc |
| +++ b/chrome/browser/search_engines/template_url.cc |
| @@ -20,6 +20,7 @@ |
| #include "base/strings/stringprintf.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "chrome/browser/google/google_util.h" |
| +#include "chrome/browser/search/search.h" |
| #include "chrome/browser/search_engines/search_terms_data.h" |
| #include "chrome/browser/search_engines/template_url_service.h" |
| #include "chrome/common/chrome_switches.h" |
| @@ -60,6 +61,7 @@ const char kGoogleBaseURLParameterFull[] = "{google:baseURL}"; |
| // Like google:baseURL, but for the Search Suggest capability. |
| const char kGoogleBaseSuggestURLParameter[] = "google:baseSuggestURL"; |
| const char kGoogleBaseSuggestURLParameterFull[] = "{google:baseSuggestURL}"; |
| +const char kGoogleBookmarkBarPinnedParameter[] = "google:bookmarkBarPinned"; |
| const char kGoogleCursorPositionParameter[] = "google:cursorPosition"; |
| const char kGoogleInstantEnabledParameter[] = "google:instantEnabledParameter"; |
| const char kGoogleInstantExtendedEnabledParameter[] = |
| @@ -193,7 +195,8 @@ TemplateURLRef::SearchTermsArgs::SearchTermsArgs(const string16& search_terms) |
| cursor_position(string16::npos), |
| omnibox_start_margin(-1), |
| page_classification(AutocompleteInput::INVALID_SPEC), |
| - append_extra_query_params(false) { |
| + append_extra_query_params(false), |
| + bookmark_bar_pinned(false) { |
| } |
| TemplateURLRef::SearchTermsArgs::~SearchTermsArgs() { |
| @@ -536,6 +539,8 @@ bool TemplateURLRef::ParseParameter(size_t start, |
| replacements->push_back(Replacement(GOOGLE_BASE_URL, start)); |
| } else if (parameter == kGoogleBaseSuggestURLParameter) { |
| replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start)); |
| + } else if (parameter == kGoogleBookmarkBarPinnedParameter) { |
| + replacements->push_back(Replacement(GOOGLE_BOOKMARK_BAR_PINNED, start)); |
| } else if (parameter == kGoogleCursorPositionParameter) { |
| replacements->push_back(Replacement(GOOGLE_CURSOR_POSITION, start)); |
| } else if (parameter == kGoogleImageOriginalHeight) { |
| @@ -828,6 +833,20 @@ std::string TemplateURLRef::HandleReplacements( |
| &url); |
| break; |
| + case GOOGLE_BOOKMARK_BAR_PINNED: |
| + if (chrome::IsInstantExtendedAPIEnabled() && |
| + !chrome::ShouldSuppressInstantExtendedOnSRP()) { |
| + // Log whether the bookmark bar is pinned when the user is seeing |
| + // InstantExtended on the SRP. |
| + DCHECK(!i->is_post_param); |
| + HandleReplacement( |
| + "bmbp", |
| + base::StringPrintf("%d", search_terms_args.bookmark_bar_pinned), |
|
Peter Kasting
2013/10/01 01:03:31
Nit: What about just
search_terms_args.bookmark
Jered
2013/10/01 18:46:15
Thanks, that's much better. Done.
|
| + *i, |
| + &url); |
| + } |
| + break; |
| + |
| case GOOGLE_CURSOR_POSITION: |
| DCHECK(!i->is_post_param); |
| if (search_terms_args.cursor_position != string16::npos) |