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

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

Issue 11280153: Add Search-. as a shortcut for the Insert key when Search is acting as a Function key. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forlanding Created 8 years 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/ui/ash/event_rewriter_unittest.cc ('k') | no next file » | 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/chromeos/keyboard_overlay_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 { "keyboardOverlayF3", IDS_KEYBOARD_OVERLAY_F3 }, 68 { "keyboardOverlayF3", IDS_KEYBOARD_OVERLAY_F3 },
69 { "keyboardOverlayF4", IDS_KEYBOARD_OVERLAY_F4 }, 69 { "keyboardOverlayF4", IDS_KEYBOARD_OVERLAY_F4 },
70 { "keyboardOverlayF5", IDS_KEYBOARD_OVERLAY_F5 }, 70 { "keyboardOverlayF5", IDS_KEYBOARD_OVERLAY_F5 },
71 { "keyboardOverlayF6", IDS_KEYBOARD_OVERLAY_F6 }, 71 { "keyboardOverlayF6", IDS_KEYBOARD_OVERLAY_F6 },
72 { "keyboardOverlayF7", IDS_KEYBOARD_OVERLAY_F7 }, 72 { "keyboardOverlayF7", IDS_KEYBOARD_OVERLAY_F7 },
73 { "keyboardOverlayF8", IDS_KEYBOARD_OVERLAY_F8 }, 73 { "keyboardOverlayF8", IDS_KEYBOARD_OVERLAY_F8 },
74 { "keyboardOverlayF9", IDS_KEYBOARD_OVERLAY_F9 }, 74 { "keyboardOverlayF9", IDS_KEYBOARD_OVERLAY_F9 },
75 { "keyboardOverlayF10", IDS_KEYBOARD_OVERLAY_F10 }, 75 { "keyboardOverlayF10", IDS_KEYBOARD_OVERLAY_F10 },
76 { "keyboardOverlayF11", IDS_KEYBOARD_OVERLAY_F11 }, 76 { "keyboardOverlayF11", IDS_KEYBOARD_OVERLAY_F11 },
77 { "keyboardOverlayF12", IDS_KEYBOARD_OVERLAY_F12 }, 77 { "keyboardOverlayF12", IDS_KEYBOARD_OVERLAY_F12 },
78 { "keyboardOverlayInsert", IDS_KEYBOARD_OVERLAY_INSERT },
78 { "keyboardOverlayInstructions", IDS_KEYBOARD_OVERLAY_INSTRUCTIONS }, 79 { "keyboardOverlayInstructions", IDS_KEYBOARD_OVERLAY_INSTRUCTIONS },
79 { "keyboardOverlayInstructionsWithSearch", 80 { "keyboardOverlayInstructionsWithSearch",
80 IDS_KEYBOARD_OVERLAY_INSTRUCTIONS_WITH_SEARCH }, 81 IDS_KEYBOARD_OVERLAY_INSTRUCTIONS_WITH_SEARCH },
81 { "keyboardOverlayInstructionsHide", IDS_KEYBOARD_OVERLAY_INSTRUCTIONS_HIDE }, 82 { "keyboardOverlayInstructionsHide", IDS_KEYBOARD_OVERLAY_INSTRUCTIONS_HIDE },
82 { "keyboardOverlayActivateLastLauncherItem", 83 { "keyboardOverlayActivateLastLauncherItem",
83 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_LAUNCHER_ITEM }, 84 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_LAUNCHER_ITEM },
84 { "keyboardOverlayActivateLastTab", IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_TAB }, 85 { "keyboardOverlayActivateLastTab", IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_TAB },
85 { "keyboardOverlayActivateLauncherItem1", 86 { "keyboardOverlayActivateLauncherItem1",
86 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_1 }, 87 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_1 },
87 { "keyboardOverlayActivateLauncherItem2", 88 { "keyboardOverlayActivateLauncherItem2",
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 switches::kHasChromeOSKeyboard); 374 switches::kHasChromeOSKeyboard);
374 375
375 bool search_key_acts_as_function_key = chromeos_keyboard && 376 bool search_key_acts_as_function_key = chromeos_keyboard &&
376 chromebook_function_key && 377 chromebook_function_key &&
377 pref_service->GetBoolean(prefs::kLanguageSearchKeyActsAsFunctionKey); 378 pref_service->GetBoolean(prefs::kLanguageSearchKeyActsAsFunctionKey);
378 379
379 // Set up the chrome://keyboardoverlay/ source. 380 // Set up the chrome://keyboardoverlay/ source.
380 ChromeURLDataManager::AddDataSource(profile, 381 ChromeURLDataManager::AddDataSource(profile,
381 CreateKeyboardOverlayUIHTMLSource(search_key_acts_as_function_key)); 382 CreateKeyboardOverlayUIHTMLSource(search_key_acts_as_function_key));
382 } 383 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/event_rewriter_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698