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

Unified Diff: chrome/browser/renderer_context_menu/render_view_context_menu.cc

Issue 1238683003: Unpunycode search keywords and short names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Restrict IDN-decoding to keywords generated from URL; Use prefs::kAcceptLanguages for IDN-decoding Created 5 years, 5 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
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 9c16c7a9562720da0cd5e68a9a355559817aa95b..32c0d6b0fe8a618ec7577d070e77db519b736ae6 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -68,6 +68,7 @@
#include "components/omnibox/browser/autocomplete_classifier.h"
#include "components/omnibox/browser/autocomplete_match.h"
#include "components/password_manager/core/common/experiments.h"
+#include "components/search_engines/search_terms_data.h"
#include "components/search_engines/template_url.h"
#include "components/search_engines/template_url_service.h"
#include "components/translate/core/browser/translate_download_manager.h"
@@ -1794,7 +1795,9 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
SearchEngineTabHelper::FromWebContents(source_web_contents_);
if (search_engine_tab_helper &&
search_engine_tab_helper->delegate()) {
- base::string16 keyword(TemplateURL::GenerateKeyword(params_.page_url));
+ base::string16 keyword(TemplateURL::GenerateKeyword(
+ params_.page_url,
+ model->search_terms_data().GetAcceptedLanguages()));
TemplateURLData data;
data.SetShortName(keyword);
data.SetKeyword(keyword);

Powered by Google App Engine
This is Rietveld 408576698