Enable Search-key modifiers for extended key shortcuts.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 60 matching lines @@
   { "keyboardOverlayF5", IDS_KEYBOARD_OVERLAY_F5 },
   { "keyboardOverlayF6", IDS_KEYBOARD_OVERLAY_F6 },
   { "keyboardOverlayF7", IDS_KEYBOARD_OVERLAY_F7 },
   { "keyboardOverlayF8", IDS_KEYBOARD_OVERLAY_F8 },
   { "keyboardOverlayF9", IDS_KEYBOARD_OVERLAY_F9 },
   { "keyboardOverlayF10", IDS_KEYBOARD_OVERLAY_F10 },
   { "keyboardOverlayF11", IDS_KEYBOARD_OVERLAY_F11 },
   { "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 },
   { "keyboardOverlayActivateLastTab", IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_TAB },
   { "keyboardOverlayActivateLauncherItem1",
     IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_1 },
   { "keyboardOverlayActivateLauncherItem2",
     IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_2 },
   { "keyboardOverlayActivateLauncherItem3",
     IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_3 },
@@ skipping 140 matching lines @@
 std::string ModifierKeyToLabel(ModifierKey modifier) {
   for (size_t i = 0; i < arraysize(kModifierToLabels); ++i) {
     if (modifier == kModifierToLabels[i].modifier) {
       return kModifierToLabels[i].label;
     }
   }
   return "";
 }
 
 ChromeWebUIDataSource* CreateKeyboardOverlayUIHTMLSource(
-    bool search_key_acts_as_function_key) {
+    bool keep_non_search_shortcuts) {
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIKeyboardOverlayHost);
 
   for (size_t i = 0; i < arraysize(kI18nContentToMessage); ++i) {
     source->AddLocalizedString(kI18nContentToMessage[i].i18n_content,
                                kI18nContentToMessage[i].message);
   }
 
   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);
   source->set_default_resource(IDR_KEYBOARD_OVERLAY_HTML);
   return source;
 }
 
 }  // namespace
 
 // The handler for Javascript messages related to the "keyboardoverlay" view.
@@ skipping 95 matching lines @@
 // KeyboardOverlayUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
     : WebDialogUI(web_ui) {
   Profile* profile = Profile::FromWebUI(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));
 }