| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" |
| 6 | 6 |
| 7 #include "ash/new_window_delegate.h" | 7 #include "ash/new_window_delegate.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/values.h" | 12 #include "base/values.h" |
| 13 #include "chrome/grit/generated_resources.h" |
| 13 #include "chromeos/chromeos_switches.h" | 14 #include "chromeos/chromeos_switches.h" |
| 14 #include "chromeos/ime/ime_keyboard.h" | 15 #include "chromeos/ime/ime_keyboard.h" |
| 15 #include "content/public/browser/web_ui.h" | 16 #include "content/public/browser/web_ui.h" |
| 16 #include "grit/generated_resources.h" | |
| 17 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| 20 const struct ModifierKeysSelectItem { | 20 const struct ModifierKeysSelectItem { |
| 21 int message_id; | 21 int message_id; |
| 22 chromeos::input_method::ModifierKey value; | 22 chromeos::input_method::ModifierKey value; |
| 23 } kModifierKeysSelectItems[] = { | 23 } kModifierKeysSelectItems[] = { |
| 24 { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH, | 24 { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH, |
| 25 chromeos::input_method::kSearchKey }, | 25 chromeos::input_method::kSearchKey }, |
| 26 { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_LEFT_CTRL, | 26 { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_LEFT_CTRL, |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 base::Bind(&KeyboardHandler::HandleShowKeyboardShortcuts, | 154 base::Bind(&KeyboardHandler::HandleShowKeyboardShortcuts, |
| 155 base::Unretained(this))); | 155 base::Unretained(this))); |
| 156 } | 156 } |
| 157 | 157 |
| 158 void KeyboardHandler::HandleShowKeyboardShortcuts(const base::ListValue* args) { | 158 void KeyboardHandler::HandleShowKeyboardShortcuts(const base::ListValue* args) { |
| 159 ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay(); | 159 ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay(); |
| 160 } | 160 } |
| 161 | 161 |
| 162 } // namespace options | 162 } // namespace options |
| 163 } // namespace chromeos | 163 } // namespace chromeos |
| OLD | NEW |