Enable Search-key modifiers for extended key shortcuts.

chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

Index: chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index 52ac6f865f03605267a5f9722a35fed2ffd05e0e..44f95f0da590ad0eb051f4dfa720a988bfa0ce05 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -78,8 +78,6 @@ struct I18nContentToMessage {
   { "keyboardOverlayF12", IDS_KEYBOARD_OVERLAY_F12 },
   { "keyboardOverlayInsert", IDS_KEYBOARD_OVERLAY_INSERT },
   { "keyboardOverlayInstructions", IDS_KEYBOARD_OVERLAY_INSTRUCTIONS },
-  { "keyboardOverlayInstructionsWithSearch",
-    IDS_KEYBOARD_OVERLAY_INSTRUCTIONS_WITH_SEARCH },
   { "keyboardOverlayInstructionsHide", IDS_KEYBOARD_OVERLAY_INSTRUCTIONS_HIDE },
   { "keyboardOverlayActivateLastLauncherItem",
     IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_LAUNCHER_ITEM },
@@ -240,7 +238,7 @@ std::string ModifierKeyToLabel(ModifierKey modifier) {
 }
 
 ChromeWebUIDataSource* CreateKeyboardOverlayUIHTMLSource(
-    bool search_key_acts_as_function_key) {
+    bool keep_non_search_shortcuts) {
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIKeyboardOverlayHost);
 
@@ -250,8 +248,8 @@ ChromeWebUIDataSource* CreateKeyboardOverlayUIHTMLSource(
   }
 
   source->AddString("keyboardOverlayLearnMoreURL", UTF8ToUTF16(kLearnMoreURL));
-  source->AddString("keyboardSearchKeyActsAsFunctionKey",
-                    search_key_acts_as_function_key ? "true" : "false");
+  source->AddString("keyboardKeepNonSearchKeyShortcuts",
+                    keep_non_search_shortcuts ? "true" : "false");
   source->set_json_path("strings.js");
   source->set_use_json_js_format_v2();
   source->add_resource_path("keyboard_overlay.js", IDR_KEYBOARD_OVERLAY_JS);
@@ -367,11 +365,11 @@ KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
   KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
   web_ui->AddMessageHandler(handler);
 
-  const bool search_key_acts_as_function_key =
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableChromebookFunctionKey);
+  const bool keep_non_search_shortcuts =
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableNonSearchExtendedKeyShortcuts);
 
   // Set up the chrome://keyboardoverlay/ source.
   ChromeURLDataManager::AddDataSource(profile,
-      CreateKeyboardOverlayUIHTMLSource(search_key_acts_as_function_key));
+      CreateKeyboardOverlayUIHTMLSource(keep_non_search_shortcuts));
 }