chrome/browser/ui/views/omnibox/omnibox_view_views.cc - Issue 2211983002: Remove search::IsQueryExtractionEnabled

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 2211983002: Remove search::IsQueryExtractionEnabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_prefetch_non_default

Patch Set: Android Created 4 years, 4 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/ui/toolbar/toolbar_model_unittest.cc ('K') | « chrome/browser/ui/toolbar/toolbar_model_unittest.cc ('k') | components/omnibox/browser/verbatim_match.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc

index a6a717ce2b6cfb4a8279bc32e24d4c2b56339c52..a04bcafc058b74f793bff3140d51f775564e8c1d 100644

--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc

+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc

@@ -16,7 +16,6 @@

#include "chrome/app/chrome_command_ids.h"

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

#include "chrome/browser/command_updater.h"

-#include "chrome/browser/search/search.h"

#include "chrome/browser/ui/omnibox/chrome_omnibox_client.h"

#include "chrome/browser/ui/omnibox/clipboard_utils.h"

#include "chrome/browser/ui/view_ids.h"

@@ -30,7 +29,6 @@

#include "components/omnibox/browser/omnibox_edit_model.h"

#include "components/omnibox/browser/omnibox_field_trial.h"

#include "components/omnibox/browser/omnibox_popup_model.h"

-#include "components/search/search.h"

#include "components/toolbar/toolbar_model.h"

#include "content/public/browser/web_contents.h"

#include "extensions/common/constants.h"

@@ -1096,14 +1094,6 @@ void OmniboxViewViews::UpdateContextMenu(ui::SimpleMenuModel* menu_contents) {

menu_contents->AddSeparator(ui::NORMAL_SEPARATOR);

- if (search::IsQueryExtractionEnabled()) {

- int select_all_position = menu_contents->GetIndexOfCommandId(

- IDS_APP_SELECT_ALL);

- DCHECK_GE(select_all_position, 0);

- menu_contents->InsertItemWithStringIdAt(

- select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL);

Peter Kasting 2016/08/09 20:55:13 Make sure that removing IDS_SHOW_URL and all its h

Marc Treib 2016/08/10 12:53:40 Yup, that's already on my list :)

- }

// Minor note: We use IDC_ for command id here while the underlying textfield

// is using IDS_ for all its command ids. This is because views cannot depend

// on IDC_ for now.