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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

Issue 393023006: Add settings for keyboard auto-repeat to options page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/options/pref_ui.js ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_CAPS_LOCK_LABEL)); 73 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_CAPS_LOCK_LABEL));
74 localized_strings->SetString("remapDiamondKeyToContent", 74 localized_strings->SetString("remapDiamondKeyToContent",
75 l10n_util::GetStringUTF16( 75 l10n_util::GetStringUTF16(
76 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_DIAMOND_KEY_LABEL)); 76 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_DIAMOND_KEY_LABEL));
77 localized_strings->SetString("sendFunctionKeys", 77 localized_strings->SetString("sendFunctionKeys",
78 l10n_util::GetStringUTF16( 78 l10n_util::GetStringUTF16(
79 IDS_OPTIONS_SETTINGS_LANGUAGES_SEND_FUNCTION_KEYS)); 79 IDS_OPTIONS_SETTINGS_LANGUAGES_SEND_FUNCTION_KEYS));
80 localized_strings->SetString("sendFunctionKeysDescription", 80 localized_strings->SetString("sendFunctionKeysDescription",
81 l10n_util::GetStringUTF16( 81 l10n_util::GetStringUTF16(
82 IDS_OPTIONS_SETTINGS_LANGUAGES_SEND_FUNCTION_KEYS_DESCRIPTION)); 82 IDS_OPTIONS_SETTINGS_LANGUAGES_SEND_FUNCTION_KEYS_DESCRIPTION));
83 localized_strings->SetString("enableAutoRepeat",
84 l10n_util::GetStringUTF16(
85 IDS_OPTIONS_SETTINGS_LANGUAGES_AUTO_REPEAT_ENABLE));
86 localized_strings->SetString("autoRepeatDelay",
87 l10n_util::GetStringUTF16(
88 IDS_OPTIONS_SETTINGS_LANGUAGES_AUTO_REPEAT_DELAY));
89 localized_strings->SetString("autoRepeatDelayLong",
90 l10n_util::GetStringUTF16(
91 IDS_OPTIONS_SETTINGS_LANGUAGES_AUTO_REPEAT_DELAY_LONG));
92 localized_strings->SetString("autoRepeatDelayShort",
93 l10n_util::GetStringUTF16(
94 IDS_OPTIONS_SETTINGS_LANGUAGES_AUTO_REPEAT_DELAY_SHORT));
95 localized_strings->SetString("autoRepeatRate",
96 l10n_util::GetStringUTF16(
97 IDS_OPTIONS_SETTINGS_LANGUAGES_AUTO_REPEAT_RATE));
98 localized_strings->SetString("autoRepeatRateSlow",
99 l10n_util::GetStringUTF16(
100 IDS_OPTIONS_SETTINGS_LANGUAGES_AUTO_REPEAT_RATE_SLOW));
101 localized_strings->SetString("autoRepeatRateFast",
102 l10n_util::GetStringUTF16(
103 IDS_OPTIONS_SETTINGS_LANGUAGES_AUTO_REPEAT_RATE_FAST));
83 localized_strings->SetString("changeLanguageAndInputSettings", 104 localized_strings->SetString("changeLanguageAndInputSettings",
84 l10n_util::GetStringUTF16( 105 l10n_util::GetStringUTF16(
85 IDS_OPTIONS_SETTINGS_CHANGE_LANGUAGE_AND_INPUT_SETTINGS)); 106 IDS_OPTIONS_SETTINGS_CHANGE_LANGUAGE_AND_INPUT_SETTINGS));
86 localized_strings->SetString("showKeyboardShortcuts", 107 localized_strings->SetString("showKeyboardShortcuts",
87 l10n_util::GetStringUTF16( 108 l10n_util::GetStringUTF16(
88 IDS_OPTIONS_SETTINGS_SHOW_KEYBOARD_SHORTCUTS)); 109 IDS_OPTIONS_SETTINGS_SHOW_KEYBOARD_SHORTCUTS));
89 110
90 for (size_t i = 0; i < arraysize(kDataValuesNames); ++i) { 111 for (size_t i = 0; i < arraysize(kDataValuesNames); ++i) {
91 base::ListValue* list_value = new base::ListValue(); 112 base::ListValue* list_value = new base::ListValue();
92 for (size_t j = 0; j < arraysize(kModifierKeysSelectItems); ++j) { 113 for (size_t j = 0; j < arraysize(kModifierKeysSelectItems); ++j) {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 base::Bind(&KeyboardHandler::HandleShowKeyboardShortcuts, 154 base::Bind(&KeyboardHandler::HandleShowKeyboardShortcuts,
134 base::Unretained(this))); 155 base::Unretained(this)));
135 } 156 }
136 157
137 void KeyboardHandler::HandleShowKeyboardShortcuts(const base::ListValue* args) { 158 void KeyboardHandler::HandleShowKeyboardShortcuts(const base::ListValue* args) {
138 ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay(); 159 ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay();
139 } 160 }
140 161
141 } // namespace options 162 } // namespace options
142 } // namespace chromeos 163 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/pref_ui.js ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698