| Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
| diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
| index 12d8b73bfaac298950148f7d0035574c6a38f829..413e5a42f390c40ab062aec57b4def46c0bee9b4 100644
|
| --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
| +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
| @@ -225,7 +225,6 @@ const struct UmaEnumCommandIdPair {
|
| {45, -1, IDC_CONTENT_CONTEXT_GOTOURL},
|
| {46, -1, IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS},
|
| {47, -1, IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_SETTINGS},
|
| - {48, -1, IDC_CONTENT_CONTEXT_ADDSEARCHENGINE},
|
| {52, -1, IDC_CONTENT_CONTEXT_OPENLINKWITH},
|
| {53, -1, IDC_CHECK_SPELLING_WHILE_TYPING},
|
| {54, -1, IDC_SPELLCHECK_MENU},
|
| @@ -1385,9 +1384,6 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
|
| return true;
|
| #endif
|
|
|
| - case IDC_CONTENT_CONTEXT_ADDSEARCHENGINE:
|
| - return !params_.keyword_url.is_empty();
|
| -
|
| case IDC_SPELLCHECK_MENU:
|
| return true;
|
|
|
| @@ -1862,34 +1858,6 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
|
| break;
|
| }
|
|
|
| - case IDC_CONTENT_CONTEXT_ADDSEARCHENGINE: {
|
| - // Make sure the model is loaded.
|
| - TemplateURLService* model =
|
| - TemplateURLServiceFactory::GetForProfile(GetProfile());
|
| - if (!model)
|
| - return;
|
| - model->Load();
|
| -
|
| - SearchEngineTabHelper* search_engine_tab_helper =
|
| - SearchEngineTabHelper::FromWebContents(source_web_contents_);
|
| - if (search_engine_tab_helper &&
|
| - search_engine_tab_helper->delegate()) {
|
| - base::string16 keyword(TemplateURL::GenerateKeyword(
|
| - params_.page_url,
|
| - GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages)));
|
| - TemplateURLData data;
|
| - data.SetShortName(keyword);
|
| - data.SetKeyword(keyword);
|
| - data.SetURL(params_.keyword_url.spec());
|
| - data.favicon_url =
|
| - TemplateURL::GenerateFaviconURL(params_.page_url.GetOrigin());
|
| - // Takes ownership of the TemplateURL.
|
| - search_engine_tab_helper->delegate()->ConfirmAddSearchProvider(
|
| - new TemplateURL(data), GetProfile());
|
| - }
|
| - break;
|
| - }
|
| -
|
| case IDC_CONTENT_CONTEXT_FORCESAVEPASSWORD:
|
| ChromePasswordManagerClient::FromWebContents(source_web_contents_)->
|
| ForceSavePassword();
|
|
|