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

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

Issue 1977183002: Removed ctrl-shift-p from the keyboard shortcut overlay. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed some additional strings regarding Google cloud print. Created 4 years, 7 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
« no previous file with comments | « chrome/browser/resources/chromeos/keyboard_overlay_data.js ('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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "ash/display/display_manager.h" 9 #include "ash/display/display_manager.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 { "keyboardOverlayNewTab", IDS_KEYBOARD_OVERLAY_NEW_TAB }, 202 { "keyboardOverlayNewTab", IDS_KEYBOARD_OVERLAY_NEW_TAB },
203 { "keyboardOverlayNewTerminal", IDS_KEYBOARD_OVERLAY_NEW_TERMINAL }, 203 { "keyboardOverlayNewTerminal", IDS_KEYBOARD_OVERLAY_NEW_TERMINAL },
204 { "keyboardOverlayNewWindow", IDS_KEYBOARD_OVERLAY_NEW_WINDOW }, 204 { "keyboardOverlayNewWindow", IDS_KEYBOARD_OVERLAY_NEW_WINDOW },
205 { "keyboardOverlayNextUser", IDS_KEYBOARD_OVERLAY_NEXT_USER }, 205 { "keyboardOverlayNextUser", IDS_KEYBOARD_OVERLAY_NEXT_USER },
206 { "keyboardOverlayNextWindow", IDS_KEYBOARD_OVERLAY_NEXT_WINDOW }, 206 { "keyboardOverlayNextWindow", IDS_KEYBOARD_OVERLAY_NEXT_WINDOW },
207 { "keyboardOverlayNextWord", IDS_KEYBOARD_OVERLAY_NEXT_WORD }, 207 { "keyboardOverlayNextWord", IDS_KEYBOARD_OVERLAY_NEXT_WORD },
208 { "keyboardOverlayOpen", IDS_KEYBOARD_OVERLAY_OPEN }, 208 { "keyboardOverlayOpen", IDS_KEYBOARD_OVERLAY_OPEN },
209 { "keyboardOverlayOpenAddressInNewTab", 209 { "keyboardOverlayOpenAddressInNewTab",
210 IDS_KEYBOARD_OVERLAY_OPEN_ADDRESS_IN_NEW_TAB }, 210 IDS_KEYBOARD_OVERLAY_OPEN_ADDRESS_IN_NEW_TAB },
211 { "keyboardOverlayOpenFileManager", IDS_KEYBOARD_OVERLAY_OPEN_FILE_MANAGER }, 211 { "keyboardOverlayOpenFileManager", IDS_KEYBOARD_OVERLAY_OPEN_FILE_MANAGER },
212 { "keyboardOverlayOpenGoogleCloudPrint",
213 IDS_KEYBOARD_OVERLAY_OPEN_GOOGLE_CLOUD_PRINT },
214 { "keyboardOverlayPageDown", IDS_KEYBOARD_OVERLAY_PAGE_DOWN }, 212 { "keyboardOverlayPageDown", IDS_KEYBOARD_OVERLAY_PAGE_DOWN },
215 { "keyboardOverlayPageUp", IDS_KEYBOARD_OVERLAY_PAGE_UP }, 213 { "keyboardOverlayPageUp", IDS_KEYBOARD_OVERLAY_PAGE_UP },
216 { "keyboardOverlayPaste", IDS_KEYBOARD_OVERLAY_PASTE }, 214 { "keyboardOverlayPaste", IDS_KEYBOARD_OVERLAY_PASTE },
217 { "keyboardOverlayPasteAsPlainText", 215 { "keyboardOverlayPasteAsPlainText",
218 IDS_KEYBOARD_OVERLAY_PASTE_AS_PLAIN_TEXT }, 216 IDS_KEYBOARD_OVERLAY_PASTE_AS_PLAIN_TEXT },
219 { "keyboardOverlayPreviousUser", IDS_KEYBOARD_OVERLAY_PREVIOUS_USER }, 217 { "keyboardOverlayPreviousUser", IDS_KEYBOARD_OVERLAY_PREVIOUS_USER },
220 { "keyboardOverlayPreviousWindow", IDS_KEYBOARD_OVERLAY_PREVIOUS_WINDOW }, 218 { "keyboardOverlayPreviousWindow", IDS_KEYBOARD_OVERLAY_PREVIOUS_WINDOW },
221 { "keyboardOverlayPreviousWord", IDS_KEYBOARD_OVERLAY_PREVIOUS_WORD }, 219 { "keyboardOverlayPreviousWord", IDS_KEYBOARD_OVERLAY_PREVIOUS_WORD },
222 { "keyboardOverlayPrint", IDS_KEYBOARD_OVERLAY_PRINT }, 220 { "keyboardOverlayPrint", IDS_KEYBOARD_OVERLAY_PRINT },
223 { "keyboardOverlayReloadCurrentPage", 221 { "keyboardOverlayReloadCurrentPage",
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui) 417 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
420 : WebDialogUI(web_ui) { 418 : WebDialogUI(web_ui) {
421 Profile* profile = Profile::FromWebUI(web_ui); 419 Profile* profile = Profile::FromWebUI(web_ui);
422 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile); 420 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
423 web_ui->AddMessageHandler(handler); 421 web_ui->AddMessageHandler(handler);
424 422
425 // Set up the chrome://keyboardoverlay/ source. 423 // Set up the chrome://keyboardoverlay/ source.
426 content::WebUIDataSource::Add(profile, 424 content::WebUIDataSource::Add(profile,
427 CreateKeyboardOverlayUIHTMLSource(profile)); 425 CreateKeyboardOverlayUIHTMLSource(profile));
428 } 426 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/keyboard_overlay_data.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698