Merge 165503

chrome/browser/ui/webui/options/chromeos/keyboard_handler.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/options/chromeos/keyboard_handler.h"
 
+#include "base/command_line.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
+#include "chrome/common/chrome_switches.h"
+#include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 const struct ModifierKeysSelectItem {
   int message_id;
   chromeos::input_method::ModifierKey value;
 } kModifierKeysSelectItems[] = {
   { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH,
     chromeos::input_method::kSearchKey },
@@ skipping 57 matching lines @@
       ListValue* option = new ListValue();
       option->Append(Value::CreateIntegerValue(value));
       option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16(
           message_id)));
       list_value->Append(option);
     }
     localized_strings->Set(kDataValuesNames[i], list_value);
   }
 }
 
+void KeyboardHandler::InitializePage() {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kHasChromeOSKeyboard))
+    return;
+  const base::FundamentalValue show_options(true);
+  web_ui()->CallJavascriptFunction(
+      "options.KeyboardOverlay.showCapsLockOptions", show_options);
+}
+
 }  // namespace options
 }  // namespace chromeos