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

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

Issue 1436583002: Revert of Remove setVoiceSearchSupported part of EmbeddedSearch SearchBox API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/ui/views/omnibox/omnibox_result_view.cc ('k') | chrome/chrome_browser_ui.gypi » ('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/chromeos/keyboard_overlay_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
6 6
7 #include "ash/display/display_manager.h" 7 #include "ash/display/display_manager.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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 { "keyboardOverlayTakeScreenshot", IDS_KEYBOARD_OVERLAY_TAKE_SCREENSHOT }, 246 { "keyboardOverlayTakeScreenshot", IDS_KEYBOARD_OVERLAY_TAKE_SCREENSHOT },
247 { "keyboardOverlayTaskManager", IDS_KEYBOARD_OVERLAY_TASK_MANAGER }, 247 { "keyboardOverlayTaskManager", IDS_KEYBOARD_OVERLAY_TASK_MANAGER },
248 { "keyboardOverlayToggleBookmarkBar", 248 { "keyboardOverlayToggleBookmarkBar",
249 IDS_KEYBOARD_OVERLAY_TOGGLE_BOOKMARK_BAR }, 249 IDS_KEYBOARD_OVERLAY_TOGGLE_BOOKMARK_BAR },
250 { "keyboardOverlayToggleCapsLock", IDS_KEYBOARD_OVERLAY_TOGGLE_CAPS_LOCK }, 250 { "keyboardOverlayToggleCapsLock", IDS_KEYBOARD_OVERLAY_TOGGLE_CAPS_LOCK },
251 { "keyboardOverlayDisableCapsLock", IDS_KEYBOARD_OVERLAY_DISABLE_CAPS_LOCK }, 251 { "keyboardOverlayDisableCapsLock", IDS_KEYBOARD_OVERLAY_DISABLE_CAPS_LOCK },
252 { "keyboardOverlayToggleChromevoxSpokenFeedback", 252 { "keyboardOverlayToggleChromevoxSpokenFeedback",
253 IDS_KEYBOARD_OVERLAY_TOGGLE_CHROMEVOX_SPOKEN_FEEDBACK }, 253 IDS_KEYBOARD_OVERLAY_TOGGLE_CHROMEVOX_SPOKEN_FEEDBACK },
254 { "keyboardOverlayToggleProjectionTouchHud", 254 { "keyboardOverlayToggleProjectionTouchHud",
255 IDS_KEYBOARD_OVERLAY_TOGGLE_PROJECTION_TOUCH_HUD }, 255 IDS_KEYBOARD_OVERLAY_TOGGLE_PROJECTION_TOUCH_HUD },
256 { "keyboardOverlayToggleSpeechInput",
257 IDS_KEYBOARD_OVERLAY_TOGGLE_SPEECH_INPUT },
256 { "keyboardOverlayUndo", IDS_KEYBOARD_OVERLAY_UNDO }, 258 { "keyboardOverlayUndo", IDS_KEYBOARD_OVERLAY_UNDO },
257 { "keyboardOverlayViewKeyboardOverlay", 259 { "keyboardOverlayViewKeyboardOverlay",
258 IDS_KEYBOARD_OVERLAY_VIEW_KEYBOARD_OVERLAY }, 260 IDS_KEYBOARD_OVERLAY_VIEW_KEYBOARD_OVERLAY },
259 { "keyboardOverlayViewSource", IDS_KEYBOARD_OVERLAY_VIEW_SOURCE }, 261 { "keyboardOverlayViewSource", IDS_KEYBOARD_OVERLAY_VIEW_SOURCE },
260 { "keyboardOverlayWordMove", IDS_KEYBOARD_OVERLAY_WORD_MOVE }, 262 { "keyboardOverlayWordMove", IDS_KEYBOARD_OVERLAY_WORD_MOVE },
261 { "keyboardOverlayZoomIn", IDS_KEYBOARD_OVERLAY_ZOOM_IN }, 263 { "keyboardOverlayZoomIn", IDS_KEYBOARD_OVERLAY_ZOOM_IN },
262 { "keyboardOverlayZoomOut", IDS_KEYBOARD_OVERLAY_ZOOM_OUT }, 264 { "keyboardOverlayZoomOut", IDS_KEYBOARD_OVERLAY_ZOOM_OUT },
263 { "keyboardOverlayZoomScreenIn", IDS_KEYBOARD_OVERLAY_ZOOM_SCREEN_IN }, 265 { "keyboardOverlayZoomScreenIn", IDS_KEYBOARD_OVERLAY_ZOOM_SCREEN_IN },
264 { "keyboardOverlayZoomScreenOut", IDS_KEYBOARD_OVERLAY_ZOOM_SCREEN_OUT }, 266 { "keyboardOverlayZoomScreenOut", IDS_KEYBOARD_OVERLAY_ZOOM_SCREEN_OUT },
265 }; 267 };
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 403
402 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui) 404 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
403 : WebDialogUI(web_ui) { 405 : WebDialogUI(web_ui) {
404 Profile* profile = Profile::FromWebUI(web_ui); 406 Profile* profile = Profile::FromWebUI(web_ui);
405 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile); 407 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
406 web_ui->AddMessageHandler(handler); 408 web_ui->AddMessageHandler(handler);
407 409
408 // Set up the chrome://keyboardoverlay/ source. 410 // Set up the chrome://keyboardoverlay/ source.
409 content::WebUIDataSource::Add(profile, CreateKeyboardOverlayUIHTMLSource()); 411 content::WebUIDataSource::Add(profile, CreateKeyboardOverlayUIHTMLSource());
410 } 412 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_result_view.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698