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

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

Issue 2816903002: Revert "[Merge to M58] Deprecate Alt+Shift+K and replace it by Search+Shift+K" (Closed)
Patch Set: Created 3 years, 8 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
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/shell.h" 9 #include "ash/shell.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 IDS_KEYBOARD_OVERLAY_SCREENSHOT_REGION }, 237 IDS_KEYBOARD_OVERLAY_SCREENSHOT_REGION },
238 { "keyboardOverlayScreenshotWindow", 238 { "keyboardOverlayScreenshotWindow",
239 IDS_KEYBOARD_OVERLAY_SCREENSHOT_WINDOW }, 239 IDS_KEYBOARD_OVERLAY_SCREENSHOT_WINDOW },
240 { "keyboardOverlayScrollUpOnePage", 240 { "keyboardOverlayScrollUpOnePage",
241 IDS_KEYBOARD_OVERLAY_SCROLL_UP_ONE_PAGE }, 241 IDS_KEYBOARD_OVERLAY_SCROLL_UP_ONE_PAGE },
242 { "keyboardOverlaySelectAll", IDS_KEYBOARD_OVERLAY_SELECT_ALL }, 242 { "keyboardOverlaySelectAll", IDS_KEYBOARD_OVERLAY_SELECT_ALL },
243 { "keyboardOverlaySelectPreviousInputMethod", 243 { "keyboardOverlaySelectPreviousInputMethod",
244 IDS_KEYBOARD_OVERLAY_SELECT_PREVIOUS_INPUT_METHOD }, 244 IDS_KEYBOARD_OVERLAY_SELECT_PREVIOUS_INPUT_METHOD },
245 { "keyboardOverlaySelectWordAtATime", 245 { "keyboardOverlaySelectWordAtATime",
246 IDS_KEYBOARD_OVERLAY_SELECT_WORD_AT_A_TIME }, 246 IDS_KEYBOARD_OVERLAY_SELECT_WORD_AT_A_TIME },
247 { "keyboardOverlayShowImeBubble", IDS_KEYBOARD_OVERLAY_SHOW_IME_BUBBLE },
248 { "keyboardOverlayShowMessageCenter", 247 { "keyboardOverlayShowMessageCenter",
249 IDS_KEYBOARD_OVERLAY_SHOW_MESSAGE_CENTER }, 248 IDS_KEYBOARD_OVERLAY_SHOW_MESSAGE_CENTER },
250 { "keyboardOverlayShowStatusMenu", IDS_KEYBOARD_OVERLAY_SHOW_STATUS_MENU }, 249 { "keyboardOverlayShowStatusMenu", IDS_KEYBOARD_OVERLAY_SHOW_STATUS_MENU },
251 { "keyboardOverlayShowWrenchMenu", IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU }, 250 { "keyboardOverlayShowWrenchMenu", IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU },
252 { "keyboardOverlaySignOut", IDS_KEYBOARD_OVERLAY_SIGN_OUT }, 251 { "keyboardOverlaySignOut", IDS_KEYBOARD_OVERLAY_SIGN_OUT },
253 { "keyboardOverlaySuspend", IDS_KEYBOARD_OVERLAY_SUSPEND }, 252 { "keyboardOverlaySuspend", IDS_KEYBOARD_OVERLAY_SUSPEND },
254 { "keyboardOverlaySwapPrimaryMonitor", 253 { "keyboardOverlaySwapPrimaryMonitor",
255 IDS_KEYBOARD_OVERLAY_SWAP_PRIMARY_MONITOR }, 254 IDS_KEYBOARD_OVERLAY_SWAP_PRIMARY_MONITOR },
256 { "keyboardOverlayTakeScreenshot", IDS_KEYBOARD_OVERLAY_TAKE_SCREENSHOT }, 255 { "keyboardOverlayTakeScreenshot", IDS_KEYBOARD_OVERLAY_TAKE_SCREENSHOT },
257 { "keyboardOverlayTaskManager", IDS_KEYBOARD_OVERLAY_TASK_MANAGER }, 256 { "keyboardOverlayTaskManager", IDS_KEYBOARD_OVERLAY_TASK_MANAGER },
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 423
425 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui) 424 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
426 : WebDialogUI(web_ui) { 425 : WebDialogUI(web_ui) {
427 Profile* profile = Profile::FromWebUI(web_ui); 426 Profile* profile = Profile::FromWebUI(web_ui);
428 web_ui->AddMessageHandler(base::MakeUnique<KeyboardOverlayHandler>(profile)); 427 web_ui->AddMessageHandler(base::MakeUnique<KeyboardOverlayHandler>(profile));
429 428
430 // Set up the chrome://keyboardoverlay/ source. 429 // Set up the chrome://keyboardoverlay/ source.
431 content::WebUIDataSource::Add(profile, 430 content::WebUIDataSource::Add(profile,
432 CreateKeyboardOverlayUIHTMLSource(profile)); 431 CreateKeyboardOverlayUIHTMLSource(profile));
433 } 432 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/keyboard_overlay_data.js ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698